blame: large-scale performance rewrite
[gitweb.git] / git-rebase--merge.sh
index 838fbed6c91053a83b1d6360f4cc4930ee2c2290..71429fd74373f3f804fc841b5dd60faca2baaec6 100644 (file)
@@ -27,7 +27,7 @@ continue_merge () {
        cmt=`cat "$state_dir/current"`
        if ! git diff-index --quiet --ignore-submodules HEAD --
        then
-               if ! git commit --no-verify -C "$cmt"
+               if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} --no-verify -C "$cmt"
                then
                        echo "Commit failed, please do not call \"git commit\""
                        echo "directly, but instead do one of the following: "