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>

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index ba3dea684096b601804058501f4631f09e6d4c38..19f1b0d9f9663c80fe708b89a1a3293cac314ac6 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -124,7 +124,8 @@ OPTIONS
        start-point is either a local or remote branch.
 
 --no-track::
        start-point is either a local or remote branch.
 
 --no-track::

-       Ignore the branch.autosetupmerge configuration variable.
+       Do not set up tracking configuration, even if the
+       branch.autosetupmerge configuration variable is true.

 
 --contains <commit>::
        Only list branches which contain the specified commit.
 
 --contains <commit>::
        Only list branches which contain the specified commit.

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 223ea9caef4d0ca875768db47e03f5c6cb71354f..4992fc61eba5213068d6c3a0307d5e2d13c968a9 100644 (file)
--- 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::
 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
 
 -l::
        Create the new branch's reflog.  This activates recording of