summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2013-04-21 21:52:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-21 22:14:42 (GMT)
commit229177aaea295a3f804f98494d7bcde9c088fc0a (patch)
treed34d337e56da22b27c56910fde0beba2ca3f7920 /builtin
parent41c21f22d0fc06f1f22489621980396aea9f7a62 (diff)
downloadgit-229177aaea295a3f804f98494d7bcde9c088fc0a.zip
git-229177aaea295a3f804f98494d7bcde9c088fc0a.tar.gz
git-229177aaea295a3f804f98494d7bcde9c088fc0a.tar.bz2
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 'builtin')
0 files changed, 0 insertions, 0 deletions