glossary: add "remote", "submodule", "superproject"
Noticed-by: Philip Oakley <philipoakley@iee.org> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
May 29, 2015 at 11:23 UTC
e6a268c534df61f8ab96ce253e852f9109decb8f
1 file changed
+16
Documentation/glossary-content.txt
+16
@@ -469,6 +469,11 @@ The most notable example is `HEAD`.
469
<<def_push,push>> to describe the mapping between remote
470
<<def_ref,ref>> and local ref.
471
472
+[[def_remote]]remote repository::
473
+ A <<def_repository,repository>> which is used to track the same
474
+ project but resides somewhere else. To communicate with remotes,
475
+ see <<def_fetch,fetch>> or <<def_push,push>>.
476
+
477
[[def_remote_tracking_branch]]remote-tracking branch::
478
A <<def_ref,ref>> that is used to follow changes from another
479
<<def_repository,repository>>. It typically looks like
@@ -515,6 +520,17 @@ The most notable example is `HEAD`.
520
is created by giving the `--depth` option to linkgit:git-clone[1], and
521
its history can be later deepened with linkgit:git-fetch[1].
522
523
+[[def_submodule]]submodule::
524
+ A <<def_repository,repository>> that holds the history of a
525
+ separate project inside another repository (the latter of
526
+ which is called <<def_superproject, superproject>>).
527
+
528
+[[def_superproject]]superproject::
529
+ A <<def_repository,repository>> that references repositories
530
+ of other projects in its working tree as <<def_submodule,submodules>>.
531
+ The superproject knows about the names of (but does not hold
532
+ copies of) commit objects of the contained submodules.
533
+
534
[[def_symref]]symref::
535
Symbolic reference: instead of containing the <<def_SHA1,SHA-1>>
536
id itself, it is of the format 'ref: refs/some/thing' and when