X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-checkout.txt;h=2e58481ed68b0cc8540b7126a9c5c389e3f67197;hb=d633f702a007ecdd19cfd884c6da90f51156ca63;hp=82929523c7166f9e5beb08689cef65cfa20c9a8c;hpb=5c054a985a5b7e758f48353ac03582c9b2a9f919;p=git.git diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 82929523c..2e58481ed 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -35,7 +35,7 @@ working tree. OPTIONS ------- -q:: - Quiet, supress feedback messages. + Quiet, suppress feedback messages. -f:: Proceed even if the index or the working tree differs @@ -50,11 +50,12 @@ OPTIONS --track:: When -b is given and a branch is created off a remote branch, set up configuration so that git-pull will automatically - retrieve data from the remote branch. Set the + retrieve data from the remote branch. Use this if you always + pull from the same remote branch into the new branch, or if you + don't want to use "git pull " explicitly. Set the branch.autosetupmerge configuration variable to true if you - want git-checkout and git-branch to behave as if - '--track' were given when you branch from a remote - tracking branch. + 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,