Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
[gitweb.git] / git-rebase--merge.sh
index e7d96de9adcb133982bbbc6d20cd3b52b3c89214..5381857c59968c38526140d53e3150f19e8d0b0c 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: "