diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-02-11 11:27:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-11 12:14:03 -0800 |
| commit | 0ed50ceb48662e1d2b4e131f1ed79252062547dd (patch) | |
| tree | 7a3f7fa47aa2ab6485b4ae6009e42fdcc49c2177 /Documentation/git-checkout.txt | |
| parent | ce32660edc2b83c6fdf550f6869e0b01e255dadb (diff) | |
| download | git-0ed50ceb48662e1d2b4e131f1ed79252062547dd.tar.gz git-0ed50ceb48662e1d2b4e131f1ed79252062547dd.tar.xz | |
Document that the default of branch.autosetupmerge is true
In 34a3e69 (git-branch: default to --track) the default was changed to
true, to help new git users. But yours truly forgot to update the
documentation. This fixes it.
Noticed by Kalle Olavi Niemitalo.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-checkout.txt')
| -rw-r--r-- | Documentation/git-checkout.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 584359ff3..b4cfa044b 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -52,10 +52,11 @@ OPTIONS 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. Set the - branch.autosetupmerge configuration variable to true 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 - '--track' were given. + '--no-track' were given. --no-track:: When -b is given and a branch is created off a remote branch, |