Merge branch 'cc/hooks-doc'

author Junio C Hamano <gitster@pobox.com>

Wed, 14 May 2008 20:34:23 +0000 (13:34 -0700)

committer Junio C Hamano <gitster@pobox.com>

Wed, 14 May 2008 20:34:23 +0000 (13:34 -0700)
author Junio C Hamano <gitster@pobox.com>
Wed, 14 May 2008 20:34:23 +0000 (13:34 -0700)
committer Junio C Hamano <gitster@pobox.com>
Wed, 14 May 2008 20:34:23 +0000 (13:34 -0700)
diff --cc Documentation/githooks.txt
Simple merge
diff --cc Documentation/repository-layout.txt
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Wed, 14 May 2008 20:34:23 +0000 (13:34 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 14 May 2008 20:34:23 +0000 (13:34 -0700)
		1	2
Documentation/githooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/repository-layout.txt	patch \|	diff1 \|	diff2 \|	blob \| history