Merge refs/heads/master from paulus

diff --git a/git-commit-script b/git-commit-script
index e47a090c970f86f9c790deae455b4fcaf51c30f6..cd28dde64d2addb0c6df7007232778a84ea88e08 100755 (executable)
--- a/git-commit-script
+++ b/git-commit-script
@@ -64,6 +64,9 @@ do
     use_commit="$1"
     no_edit=t
     shift ;;
+  -e|--e|--ed|--edi|--edit)
+    no_edit=
+    shift ;;
   -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
     signoff=t
     shift ;;
@@ -195,8 +198,8 @@ else
 fi
 if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
 then
-       sed -ne '/^#/p' .editmsg
-       rm .editmsg
+       rm -f .editmsg
+       git-status-script
        exit 1
 fi
 case "$no_edit" in