![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Jeff King <peff@peff.net> | |
| Mon, 13 Apr 2009 11:11:56 +0000 (07:11 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Apr 2009 16:02:18 +0000 (09:02 -0700) | ||
| commit | 167d7445433bb6dfac6b844b99ae455129326141 | |
| tree | 463da3bb726f40057de40f455d07d6ac7c09a463 | tree | snapshot |
| parent | 70e966477aacf46d4d6cb8c01f8bd9a9ceb5e80f | commit | diff |
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>
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>
| Documentation/git-branch.txt | diff | blob | history | |
| Documentation/git-checkout.txt | diff | blob | history |