tree 463da3bb726f40057de40f455d07d6ac7c09a463
parent 70e966477aacf46d4d6cb8c01f8bd9a9ceb5e80f
author Jeff King <peff@peff.net> 1239621116 -0400
committer Junio C Hamano <gitster@pobox.com> 1239638538 -0700

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>