Merge branch 'maint-1.5.1' into maint

* maint-1.5.1:
Document branch.autosetupmerge.

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4bbe1162cbb3449fd841007fbcf855a4b0e44497..c1306a69e54d61104f249eacf5c158e31c73e143 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -287,6 +287,13 @@ apply.whitespace::
        Tells `git-apply` how to handle whitespaces, in the same way
        as the '--whitespace' option. See gitlink:git-apply[1].
 
+branch.autosetupmerge::
+       Tells `git-branch' and `git-checkout' to setup new branches
+       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 defaults to false.
+
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.
        If this option is not given, `git fetch` defaults to remote "origin".