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/git-merge-index.txt | |
| parent | 41c21f22d0fc06f1f22489621980396aea9f7a62 (diff) | |
| download | git-229177aaea295a3f804f98494d7bcde9c088fc0a.tar.gz git-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 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions