summaryrefslogtreecommitdiff
path: root/git-commit.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-28 22:39:57 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-28 22:39:57 (GMT)
commit0a98f9d13802880a68ce6564b9f47b1c3e3341c7 (patch)
tree1465fa12fd8127c4c76405f0fc3d1c44583365d4 /git-commit.sh
parent03bcaacaadbb325f412e6dffec27fea6acb9321e (diff)
parent9529a2524a29c15107905f2f8f0b310a40880dc7 (diff)
downloadgit-0a98f9d13802880a68ce6564b9f47b1c3e3341c7.zip
git-0a98f9d13802880a68ce6564b9f47b1c3e3341c7.tar.gz
git-0a98f9d13802880a68ce6564b9f47b1c3e3341c7.tar.bz2
Merge branch 'maint' to synchronize with 1.5.0.6
Diffstat (limited to 'git-commit.sh')
-rwxr-xr-xgit-commit.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-commit.sh b/git-commit.sh
index 3656d60..292cf96 100755
--- 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