diff options
| author | Johan Herland <johan@herland.net> | 2013-04-21 23:52:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-21 15:14:42 -0700 |
| commit | 229177aaea295a3f804f98494d7bcde9c088fc0a (patch) | |
| tree | d34d337e56da22b27c56910fde0beba2ca3f7920 /Documentation/glossary-content.txt | |
| parent | 41c21f22d0fc06f1f22489621980396aea9f7a62 (diff) | |
| download | git-229177aaea295a3f804f98494d7bcde9c088fc0a.tar.gz | |
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>
Diffstat (limited to 'Documentation/glossary-content.txt')
| -rw-r--r-- | Documentation/glossary-content.txt | 13 |
1 files changed, 7 insertions, 6 deletions
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 <<def_branch,branch>> that is used to follow changes from - another <<def_repository,repository>>. 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 <<def_ref,ref>> in a Pull: - <<def_refspec,refspec>>. + A <<def_ref,ref>> that is used to follow changes from another + <<def_repository,repository>>. 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 <<def_refspec,refspec>>. A remote-tracking + branch should not contain direct modifications or have local + commits made to it. [[def_repository]]repository:: A collection of <<def_ref,refs>> together with an |