Merge branch 'maint' of git://repo.or.cz/git-gui into maint

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4e222f15a5b2b84eb5d55bc79c605510bd89b7b6..6d8cca46ab934826a84647cbd6e441fee286f330 100644 (file)
--- 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.