diff options
| author |  Jeff King <peff@peff.net> | 2009-04-13 07:11:56 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-13 09:02:18 -0700 |
| commit | 167d7445433bb6dfac6b844b99ae455129326141 (patch) | |
| tree | 463da3bb726f40057de40f455d07d6ac7c09a463 /Documentation/git-cvsserver.txt | |
| parent | doc: clarify --no-track option (diff) | |
| download | tgif-167d7445433bb6dfac6b844b99ae455129326141.tar.xz | |
doc: refer to tracking configuration as "upstream"
The term "tracking" often creates confusion between remote
tracking branches and local branches which track a remote
branch. The term "upstream" captures more clearly the idea
of "branch A is based on branch B in some way", so it makes
sense to mention it.
At the same time, upstream branches are used for more
than just git-pull these days; let's mention that here.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cvsserver.txt')
0 files changed, 0 insertions, 0 deletions