From: Johan Herland Date: Sun, 21 Apr 2013 21:52:06 +0000 (+0200) Subject: glossary: Update and rephrase the definition of a remote-tracking branch X-Git-Tag: v1.8.3.2~16^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/229177aaea295a3f804f98494d7bcde9c088fc0a?hp=41c21f22d0fc06f1f22489621980396aea9f7a62 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 2478a3963c..7a79f26231 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -423,12 +423,13 @@ should not be combined with other pathspec. linkgit:git-push[1]. [[def_remote_tracking_branch]]remote-tracking branch:: - A regular Git <> that is used to follow changes from - another <>. A remote-tracking - branch should not contain direct modifications or have local commits - made to it. A remote-tracking branch can usually be - identified as the right-hand-side <> in a Pull: - <>. + A <> that is used to follow changes from another + <>. It typically looks like + 'refs/remotes/foo/bar' (indicating that it tracks a branch named + 'bar' in a remote named 'foo'), and matches the right-hand-side of + a configured fetch <>. A remote-tracking + branch should not contain direct modifications or have local + commits made to it. [[def_repository]]repository:: A collection of <> together with an