Sync with 2.16.6

[thirdparty/git.git] / git-rebase--am.sh

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 14c50782e096966b860d49cbaed7658e9f56958f..be3f068922c5a3ba0d1112f3b8b1cf1228567d2e 100644 (file)
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -27,6 +27,9 @@ skip)
        move_to_original_branch
        return
        ;;
+show-current-patch)
+       exec git am --show-current-patch
+       ;;
 esac
 
 if test -z "$rebase_root"
@@ -46,6 +49,7 @@ then
        # makes this easy
        git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} --allow-empty \
                $allow_rerere_autoupdate --right-only "$revisions" \
+               $allow_empty_message \
                ${restrict_revision+^$restrict_revision}
        ret=$?
 else