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>
Jeff King committed
Apr 13, 2009 at 07:11 UTC
70e966477aacf46d4d6cb8c01f8bd9a9ceb5e80f
2 files changed
+4
-2
Documentation/git-branch.txt
+2
-1
@@ -124,7 +124,8 @@ OPTIONS
124
start-point is either a local or remote branch.
125
126
--no-track::
127
- Ignore the branch.autosetupmerge configuration variable.
127
+ Do not set up tracking configuration, even if the
128
+ branch.autosetupmerge configuration variable is true.
129
130
--contains <commit>::
131
Only list branches which contain the specified commit.
Documentation/git-checkout.txt
+2
-1
@@ -90,7 +90,8 @@ guessing results in an empty name, the guessing is aborted. You can
90
explicitly give a name with '-b' in such a case.
91
92
--no-track::
93
- Ignore the branch.autosetupmerge configuration variable.
93
+ Do not set up tracking configuration, even if the
94
+ branch.autosetupmerge configuration variable is true.
95
96
-l::
97
Create the new branch's reflog. This activates recording of