From: Junio C Hamano <junkio@cox.net>
Date: Thu, 24 May 2007 05:34:11 +0000 (-0700)
Subject: Merge branch 'maint-1.5.1' into maint
X-Git-Tag: v1.5.2.1~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/baf5597ae43398e485f63f8e9216d34b5cd0a0d6?hp=7ca055f75ad7ffd2251d4b607fbb86d7bcfd77c7

Merge branch 'maint-1.5.1' into maint

* maint-1.5.1:
Documentation: fix git-config.xml generation
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index c1306a69e5..fdb71de9f6 100644
--- 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`