projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'lt/diff' into next
[git.git]
/
git-commit.sh
diff --git
a/git-commit.sh
b/git-commit.sh
index
d9ec1f1
..
330a434
100755
(executable)
--- a/
git-commit.sh
+++ b/
git-commit.sh
@@
-609,7
+609,7
@@
fi
test -z "$only_include_assumed" || echo "$only_include_assumed"
run_status
} >>"$GIT_DIR"/COMMIT_EDITMSG
test -z "$only_include_assumed" || echo "$only_include_assumed"
run_status
} >>"$GIT_DIR"/COMMIT_EDITMSG
-if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ]
+if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD"
-a -z "$amend"
]
then
rm -f "$GIT_DIR/COMMIT_EDITMSG"
run_status
then
rm -f "$GIT_DIR/COMMIT_EDITMSG"
run_status