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 <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johan Herland committed
Apr 21, 2013 at 23:52 UTC
229177aaea295a3f804f98494d7bcde9c088fc0a
1 file changed
+7
-6
Documentation/glossary-content.txt
+7
-6
@@ -423,12 +423,13 @@ should not be combined with other pathspec.
423
linkgit:git-push[1].
424
425
[[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.
433
434
[[def_repository]]repository::
435
A collection of <<def_ref,refs>> together with an