Merge branch 'maint'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index eb2e79ae2f793e61dcfe096ffbeb591b62b7de94..3d8f03dfe54f5aff199f04b1bf1992d9b75916fa 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -281,7 +281,7 @@ apply.whitespace::
        as the '--whitespace' option. See gitlink:git-apply[1].
 
 branch.autosetupmerge::
-       Tells `git-branch' and `git-checkout' to setup new branches
+       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`