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>
Johannes Schindelin committed
Feb 11, 2008 at 11:27 UTC
0ed50ceb48662e1d2b4e131f1ed79252062547dd
3 files changed
+13
-11
Documentation/config.txt
+1
-1
@@ -333,7 +333,7 @@ branch.autosetupmerge::
333
so that linkgit:git-pull[1] will appropriately merge from that
334
remote branch. Note that even if this option is not set,
335
this behavior can be chosen per-branch using the `--track`
336
- and `--no-track` options. This option defaults to false.
336
+ and `--no-track` options. This option defaults to true.
337
338
branch.<name>.remote::
339
When in branch <name>, it tells `git fetch` which remote to fetch.
Documentation/git-branch.txt
+8
-7
@@ -34,11 +34,11 @@ Note that this will create the new branch, but it will not switch the
34
working tree to it; use "git checkout <newbranch>" to switch to the
35
new branch.
36
37
-When a local branch is started off a remote branch, git can setup the
37
+When a local branch is started off a remote branch, git sets up the
38
branch so that linkgit:git-pull[1] will appropriately merge from that
39
-remote branch. If this behavior is desired, it is possible to make it
40
-the default using the global `branch.autosetupmerge` configuration
41
-flag. Otherwise, it can be chosen per-branch using the `--track`
39
+remote branch. If this behavior is not desired, it is possible to
40
+disable it using the global `branch.autosetupmerge` configuration
41
+flag. That setting can be overridden by using the `--track`
42
and `--no-track` options.
43
44
With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
@@ -108,10 +108,11 @@ OPTIONS
108
Set up configuration so that git-pull will automatically
109
retrieve data from the remote branch. Use this if you always
110
pull from the same remote branch into the new branch, or if you
111
- don't want to use "git pull <repository> <refspec>" explicitly. Set the
112
- branch.autosetupmerge configuration variable to true if you
111
+ don't want to use "git pull <repository> <refspec>" explicitly.
112
+ This behavior is the default. Set the
113
+ branch.autosetupmerge configuration variable to false if you
114
want git-checkout and git-branch to always behave as if
114
- '--track' were given.
115
+ '--no-track' were given.
116
117
--no-track::
118
When a branch is created off a remote branch,
Documentation/git-checkout.txt
+4
-3
@@ -52,10 +52,11 @@ OPTIONS
52
set up configuration so that git-pull will automatically
53
retrieve data from the remote branch. Use this if you always
54
pull from the same remote branch into the new branch, or if you
55
- don't want to use "git pull <repository> <refspec>" explicitly. Set the
56
- branch.autosetupmerge configuration variable to true if you
55
+ don't want to use "git pull <repository> <refspec>" explicitly.
56
+ This behavior is the default. Set the
57
+ branch.autosetupmerge configuration variable to false if you
58
want git-checkout and git-branch to always behave as if
58
- '--track' were given.
59
+ '--no-track' were given.
60
61
--no-track::
62
When -b is given and a branch is created off a remote branch,