summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-04-13 11:11:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-13 16:02:18 (GMT)
commit167d7445433bb6dfac6b844b99ae455129326141 (patch)
tree463da3bb726f40057de40f455d07d6ac7c09a463 /Documentation/git-checkout.txt
parent70e966477aacf46d4d6cb8c01f8bd9a9ceb5e80f (diff)
downloadgit-167d7445433bb6dfac6b844b99ae455129326141.zip
git-167d7445433bb6dfac6b844b99ae455129326141.tar.gz
git-167d7445433bb6dfac6b844b99ae455129326141.tar.bz2
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-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 4992fc6..16d3c87 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -90,7 +90,7 @@ guessing results in an empty name, the guessing is aborted. You can
explicitly give a name with '-b' in such a case.
--no-track::
- Do not set up tracking configuration, even if the
+ Do not set up "upstream" configuration, even if the
branch.autosetupmerge configuration variable is true.
-l::