Merge branch 'maint-1.5.1' into maint

* maint-1.5.1: Documentation: fix git-config.xml generation
git-mirror · May 24, 2007 · baf5597 · baf5597
2 parents 7ca055f + 5fdcf75
commit baf5597
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -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`