summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-16 14:33:51 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-16 14:33:51 -0700
commit6de4c808391ffff01185c093d6c46f2861f48862 (patch)
treed81826d1015e8c5f7c735651a7f9bd20df2db772
parent6588f82ff6aa8ff7857304c10b18ab062e67bb52 (diff)
parente6a268c534df61f8ab96ce253e852f9109decb8f (diff)
downloadgit-6de4c808391ffff01185c093d6c46f2861f48862.tar.gz
Merge branch 'sb/glossary-submodule' into maint
* sb/glossary-submodule: glossary: add "remote", "submodule", "superproject"
-rw-r--r--Documentation/glossary-content.txt16
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index bf383c2e8c..ab18f4baca 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -469,6 +469,11 @@ The most notable example is `HEAD`.
<<def_push,push>> to describe the mapping between remote
<<def_ref,ref>> and local ref.
+[[def_remote]]remote repository::
+ A <<def_repository,repository>> which is used to track the same
+ project but resides somewhere else. To communicate with remotes,
+ see <<def_fetch,fetch>> or <<def_push,push>>.
+
[[def_remote_tracking_branch]]remote-tracking branch::
A <<def_ref,ref>> that is used to follow changes from another
<<def_repository,repository>>. It typically looks like
@@ -515,6 +520,17 @@ The most notable example is `HEAD`.
is created by giving the `--depth` option to linkgit:git-clone[1], and
its history can be later deepened with linkgit:git-fetch[1].
+[[def_submodule]]submodule::
+ A <<def_repository,repository>> that holds the history of a
+ separate project inside another repository (the latter of
+ which is called <<def_superproject, superproject>>).
+
+[[def_superproject]]superproject::
+ A <<def_repository,repository>> that references repositories
+ of other projects in its working tree as <<def_submodule,submodules>>.
+ The superproject knows about the names of (but does not hold
+ copies of) commit objects of the contained submodules.
+
[[def_symref]]symref::
Symbolic reference: instead of containing the <<def_SHA1,SHA-1>>
id itself, it is of the format 'ref: refs/some/thing' and when