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/config.txt | |
| parent | ce32660edc2b83c6fdf550f6869e0b01e255dadb (diff) | |
| download | git-0ed50ceb48662e1d2b4e131f1ed79252062547dd.tar.gz | |
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/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4e222f15a5..6d8cca46ab 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -333,7 +333,7 @@ branch.autosetupmerge:: so that linkgit:git-pull[1] will appropriately merge from that remote branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` - and `--no-track` options. This option defaults to false. + and `--no-track` options. This option defaults to true. branch.<name>.remote:: When in branch <name>, it tells `git fetch` which remote to fetch. |