X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-checkout.txt;h=5aa69c0e12a6756fd6f79c117008a373f65ba5f5;hb=fc721b699b817e9cb78994c6dd6d86e744bd2112;hp=c0f9c6e88c24ee3cbfd91d70bb6a1f3d94f0ed4b;hpb=7dde4bb3674da53dd9e33c741bea3fe680690a0d;p=git.git diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index c0f9c6e88..5aa69c0e1 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git checkout' [-q] [-f] [[--track | --no-track] -b [-l]] [-m] [] -'git checkout' [] ... +'git checkout' [] [--] ... DESCRIPTION ----------- @@ -49,14 +49,14 @@ OPTIONS -t:: --track:: - When creating a new branch, set up configuration so that `git-pull` + When creating a new branch, set up configuration so that 'git-pull' will automatically retrieve data from the start point, which must be a branch. Use this if you always pull from the same upstream branch into the new branch, and if you don't want to use "git pull " explicitly. This behavior is the default when the start point is a remote branch. Set the branch.autosetupmerge configuration variable to `false` if you want - `git-checkout` and `git-branch` to always behave as if '--no-track' were + 'git-checkout' and 'git-branch' to always behave as if '--no-track' were given. Set it to `always` if you want this behavior when the start-point is either a local or remote branch.