kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Johan Herland 2013-04-21 23:52:06 +02:00 committed by Junio C Hamano
parent 41c21f22d0
commit 229177aaea
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/glossary-content.txt
View File

@ -423,12 +423,13 @@ should not be combined with other pathspec.
linkgit:git-push[1]. linkgit:git-push[1].


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


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