Merge branch 'maint' to synchronize with 1.5.0.6

2007-03-28 15:39:57 -07:00
parent 03bcaacaad 9529a2524a
commit 0a98f9d138
3 changed files with 28 additions and 3 deletions
--- a/git-commit.sh
+++ b/git-commit.sh
@ -371,7 +371,7 @@ t,)
 		if test -z "$initial_commit"
 		then
 			cp "$THIS_INDEX" "$TMP_INDEX"
-			GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -m HEAD
+			GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -i -m HEAD
 		else
 			rm -f "$TMP_INDEX"
 		fi || exit