Merge commit 'git-gui/master'

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index aeece848a542cd72894f4bf3f1bb9f67d18d5c3d..4b67f0adf721d540ddd437254de4aa069f1be0ae 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -309,10 +309,7 @@ branch.autosetupmerge::
        so that gitlink: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 can have values
-       'false' (never touch the configuration), 'all' (do this
-       for all branches), or 'true' (do this only when
-       branching from a remote tracking branch), and defaults to 'true'.
+       and `--no-track` options.  This option defaults to false.
 
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.