X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-commit-script;h=1d59f46b94fd817b87202ab7f053a0d60e03cf20;hb=3c4e8a636f4de3668b24d0020df731cdc78ae6e9;hp=dae487f3fd8b65534cd90a25312b56dd5403020e;hpb=80bd6f3064a6009cd18a4dab9ce6d29681cec4af;p=git.git

diff --git a/git-commit-script b/git-commit-script
index dae487f3..1d59f46b 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -6,7 +6,7 @@
 . git-sh-setup-script || die "Not a git archive"
 
 usage () {
-	die 'git commit [-m existing-commit] [<path>...]'
+	die 'git commit [--all] [-m existing-commit] [<path>...]'
 }
 
 files=()
@@ -86,7 +86,7 @@ else
 	fi >.editmsg
 	git-status-script >>.editmsg
 fi
-if [ "$?" != "0" ]
+if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
 then
 	cat .editmsg
 	rm .editmsg