Merge refs/heads/master from paulus

diff --git a/git-commit-script b/git-commit-script
index 4987e37861adac29af5bfd03a8d8e1e6932338e0..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 ;;