diff options
| author | Jeff King <peff@peff.net> | 2009-04-13 07:11:16 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-13 09:01:00 -0700 |
| commit | 70e966477aacf46d4d6cb8c01f8bd9a9ceb5e80f (patch) | |
| tree | e2bfdd31bba9b8e3cc1cb3cef82479c5acd4b5a5 | |
| parent | f800b65bea1504299747e7be03ee279508a74e1f (diff) | |
| download | git-70e966477aacf46d4d6cb8c01f8bd9a9ceb5e80f.tar.gz git-70e966477aacf46d4d6cb8c01f8bd9a9ceb5e80f.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-branch.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-checkout.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index ba3dea684..19f1b0d9f 100644 --- 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:: - 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. diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 223ea9cae..4992fc61e 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 |