From: Jeff King Date: Mon, 13 Apr 2009 11:11:16 GMT Subject: [PATCH 1/5] doc: clarify --no-track option Message-ID: <20090413111116.GA15982@coredump.intra.peff.net> In-Reply-To: <20090413110947.GA15647@coredump.intra.peff.net> 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 --- This I just noticed while working in the area, and it bothered me. Documentation/git-branch.txt | 3 ++- 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 ba3dea6..19f1b0d 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 :: Only list branches which contain the specified commit. 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 -- 1.6.3.rc0.148.g141203.dirty