Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
doc: refer to tracking configuration as "upstream"
[gitweb.git]
/
Documentation
/
git-checkout.txt
diff --git
a/Documentation/git-checkout.txt
b/Documentation/git-checkout.txt
index 4992fc61eba5213068d6c3a0307d5e2d13c968a9..16d3c872a056eed29806d96e4de2544963df72bd 100644
(file)
--- 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::