From: J. Bruce Fields Date: Mon, 16 Apr 2007 04:37:12 GMT Subject: [PATCH 3/7] Documentation: clarify track/no-track option. Message-ID: <7375.23060893199$1176698257@news.gmane.org> In-Reply-To: <1176698236722-git-send-email-> From: J. Bruce Fields Fix the description of the --no-track option so it no longer says the opposite of what was intended. Also mention branch.autosetupmerge explicitly. Signed-off-by: "J. Bruce Fields" --- Documentation/git-checkout.txt | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 2ead493..337b3d5 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -49,13 +49,17 @@ OPTIONS --track:: When -b is given and a branch is created off a remote branch, - setup so that git-pull will automatically retrieve data from - the remote branch. + set up configuration so that git-pull will automatically + retrieve data from the remote branch. Set the + branch.autosetupmerge configuration variable to true if you + want git-checkout and git-branch to always behave as if + '--track' were given. --no-track:: When -b is given and a branch is created off a remote branch, - force that git-pull will automatically retrieve data from - the remote branch independent of the configuration settings. + set up configuration so that git-pull will not retrieve data + from the remote branch, ignoring the branch.autosetupmerge + configuration variable. -l:: Create the new branch's ref log. This activates recording of -- 1.5.1.1.98.gedb4f