pretty: note that %cd respects the --date= option

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index f6b5dd03d76ab7a0aa804ba110bf73cce031c641..66c64d7ef24d8eeb880428b132bb15997aac9c4c 100644 (file)
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -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: "