Merge branch 'fixes'

author Junio C Hamano <junkio@cox.net>

Tue, 18 Oct 2005 00:41:37 +0000 (17:41 -0700)

committer Junio C Hamano <junkio@cox.net>

Tue, 18 Oct 2005 00:41:37 +0000 (17:41 -0700)
author Junio C Hamano <junkio@cox.net>
Tue, 18 Oct 2005 00:41:37 +0000 (17:41 -0700)
committer Junio C Hamano <junkio@cox.net>
Tue, 18 Oct 2005 00:41:37 +0000 (17:41 -0700)
diff --cc Documentation/git-checkout-index.txt
Simple merge
diff --cc checkout-index.c
Simple merge
author	Junio C Hamano <junkio@cox.net>
	Tue, 18 Oct 2005 00:41:37 +0000 (17:41 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Tue, 18 Oct 2005 00:41:37 +0000 (17:41 -0700)
		1	2
Documentation/git-checkout-index.txt	patch \|	diff1 \|	diff2 \|	blob \| history
checkout-index.c	patch \|	diff1 \|	diff2 \|	blob \| history