Skip to content

Commit 229177a

Browse files
jherlandgitster
authored andcommitted
glossary: Update and rephrase the definition of a remote-tracking branch
The definition of a remote-tracking branch in the glossary have been out-of-date for a while (by e.g. referring to "Pull:" from old-style $GIT_DIR/remotes files). Also, the preceding patches have formalized that a remote-tracking branch must match a configured refspec in order to be usable as an upstream. This patch rewrites the paragraph on remote-tracking branches accordingly. Signed-off-by: Johan Herland <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 41c21f2 commit 229177a

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

Documentation/glossary-content.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -423,12 +423,13 @@ should not be combined with other pathspec.
423423
linkgit:git-push[1].
424424

425425
[[def_remote_tracking_branch]]remote-tracking branch::
426-
A regular Git <<def_branch,branch>> that is used to follow changes from
427-
another <<def_repository,repository>>. A remote-tracking
428-
branch should not contain direct modifications or have local commits
429-
made to it. A remote-tracking branch can usually be
430-
identified as the right-hand-side <<def_ref,ref>> in a Pull:
431-
<<def_refspec,refspec>>.
426+
A <<def_ref,ref>> that is used to follow changes from another
427+
<<def_repository,repository>>. It typically looks like
428+
'refs/remotes/foo/bar' (indicating that it tracks a branch named
429+
'bar' in a remote named 'foo'), and matches the right-hand-side of
430+
a configured fetch <<def_refspec,refspec>>. A remote-tracking
431+
branch should not contain direct modifications or have local
432+
commits made to it.
432433

433434
[[def_repository]]repository::
434435
A collection of <<def_ref,refs>> together with an

0 commit comments

Comments
 (0)