Sync with GIT 1.5.3.4

author Junio C Hamano <gitster@pobox.com>

Wed, 3 Oct 2007 10:03:15 +0000 (03:03 -0700)

committer Junio C Hamano <gitster@pobox.com>

Wed, 3 Oct 2007 10:03:15 +0000 (03:03 -0700)
author Junio C Hamano <gitster@pobox.com>
Wed, 3 Oct 2007 10:03:15 +0000 (03:03 -0700)
committer Junio C Hamano <gitster@pobox.com>
Wed, 3 Oct 2007 10:03:15 +0000 (03:03 -0700)
diff --cc Documentation/config.txt
Simple merge
diff --cc git-commit.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Wed, 3 Oct 2007 10:03:15 +0000 (03:03 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 3 Oct 2007 10:03:15 +0000 (03:03 -0700)
		1	2
Documentation/config.txt	patch \|	diff1 \|	diff2 \|	blob \| history
git-commit.sh	patch \|	diff1 \|	diff2 \|	blob \| history