summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-04-13 11:11:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-13 16:01:00 (GMT)
commit70e966477aacf46d4d6cb8c01f8bd9a9ceb5e80f (patch)
treee2bfdd31bba9b8e3cc1cb3cef82479c5acd4b5a5 /Documentation/git-checkout.txt
parentf800b65bea1504299747e7be03ee279508a74e1f (diff)
downloadgit-70e966477aacf46d4d6cb8c01f8bd9a9ceb5e80f.zip
git-70e966477aacf46d4d6cb8c01f8bd9a9ceb5e80f.tar.gz
git-70e966477aacf46d4d6cb8c01f8bd9a9ceb5e80f.tar.bz2
doc: clarify --no-track option
It is not really about ignoring the config option; it is about turning off tracking, _even if_ the config option is set. 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.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 223ea9c..4992fc6 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -90,7 +90,8 @@ guessing results in an empty name, the guessing is aborted. You can
explicitly give a name with '-b' in such a case.
--no-track::
- Ignore the branch.autosetupmerge configuration variable.
+ Do not set up tracking configuration, even if the
+ branch.autosetupmerge configuration variable is true.
-l::
Create the new branch's reflog. This activates recording of