Code

Documentation: fix git-config.xml generation
authorJames Bowes <jbowes@dangerouslyinc.com>
Wed, 23 May 2007 22:16:12 +0000 (18:16 -0400)
committerJunio C Hamano <junkio@cox.net>
Thu, 24 May 2007 00:48:42 +0000 (17:48 -0700)
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/config.txt

index 6593f2e93709c19ef6808dbfd235ca43b23c388d..65ed64a45744aa1a05615730910f8e5de2bbe933 100644 (file)
@@ -288,7 +288,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`