diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-28 00:27:44 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-28 00:27:44 +0000 |
commit | 24bc09a2408f779de87b173b93386f5d1cbeee34 (patch) | |
tree | fed4584ad7fba36e609ec2ad9eed33fc9aee2c1d /git-checkout.txt | |
parent | 69f491759956153218a1ac862629c439a194d865 (diff) | |
download | git-htmldocs-24bc09a2408f779de87b173b93386f5d1cbeee34.tar.gz |
Autogenerated HTML docs for v1.5.4.3-325-g6d21
Diffstat (limited to 'git-checkout.txt')
-rw-r--r-- | git-checkout.txt | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index b4cfa044b..4014e7256 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -48,21 +48,19 @@ OPTIONS may restrict the characters allowed in a branch name. --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. 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 <repository> <refspec>" explicitly. - This behavior is the default. Set the - branch.autosetupmerge configuration variable to false if you - want git-checkout and git-branch to always behave as if - '--no-track' were given. + 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 + <repository> <refspec>" 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 + given. Set it to `always` if you want this behavior when the + start-point is either a local or remote branch. --no-track:: - When -b is given and a branch is created off a remote branch, - set up configuration so that git-pull will not retrieve data - from the remote branch, ignoring the branch.autosetupmerge - configuration variable. + Ignore the branch.autosetupmerge configuration variable. -l:: Create the new branch's reflog. This activates recording of |