Skip to content

Commit e6a268c

Browse files
stefanbellergitster
authored andcommitted
glossary: add "remote", "submodule", "superproject"
Noticed-by: Philip Oakley <[email protected]> Helped-by: Junio C Hamano <[email protected]> Signed-off-by: Stefan Beller <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3d4a3ff commit e6a268c

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

Documentation/glossary-content.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,11 @@ The most notable example is `HEAD`.
469469
<<def_push,push>> to describe the mapping between remote
470470
<<def_ref,ref>> and local ref.
471471

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+
472477
[[def_remote_tracking_branch]]remote-tracking branch::
473478
A <<def_ref,ref>> that is used to follow changes from another
474479
<<def_repository,repository>>. It typically looks like
@@ -515,6 +520,17 @@ The most notable example is `HEAD`.
515520
is created by giving the `--depth` option to linkgit:git-clone[1], and
516521
its history can be later deepened with linkgit:git-fetch[1].
517522

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+
518534
[[def_symref]]symref::
519535
Symbolic reference: instead of containing the <<def_SHA1,SHA-1>>
520536
id itself, it is of the format 'ref: refs/some/thing' and when

0 commit comments

Comments
 (0)