Merge branch 'em/commit-claim'

author Junio C Hamano <gitster@pobox.com>

Mon, 30 Nov 2009 22:43:26 +0000 (14:43 -0800)

committer Junio C Hamano <gitster@pobox.com>

Mon, 30 Nov 2009 22:43:26 +0000 (14:43 -0800)
author Junio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:43:26 +0000 (14:43 -0800)
committer Junio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:43:26 +0000 (14:43 -0800)
diff --cc Documentation/git-commit.txt
Simple merge
diff --cc builtin-commit.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Mon, 30 Nov 2009 22:43:26 +0000 (14:43 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 30 Nov 2009 22:43:26 +0000 (14:43 -0800)
		1	2
Documentation/git-commit.txt	patch \|	diff1 \|	diff2 \|	blob \| history
builtin-commit.c	patch \|	diff1 \|	diff2 \|	blob \| history