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 /t/t3507-cherry-pick-conflict.sh | |
| parent | branch.c: Validate tracking branches with refspecs instead of refs/remotes/* (diff) | |
| download | tgif-229177aaea295a3f804f98494d7bcde9c088fc0a.tar.xz | |
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 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions