Merge branch 'maint-1.5.4' into maint-1.5.5

diff --git a/git-rebase.sh b/git-rebase.sh
index ff66af3ba8348ff86b25c91a1875b93f885a048c..60c458f201f8f98bb1c6e115c009525659c2ee20 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -62,7 +62,7 @@ continue_merge () {
        cmt=`cat "$dotest/current"`
        if ! git diff-index --quiet HEAD --
        then
-               if ! git-commit -C "$cmt"
+               if ! git commit --no-verify -C "$cmt"
                then
                        echo "Commit failed, please do not call \"git commit\""
                        echo "directly, but instead do one of the following: "