diff options
Diffstat (limited to 'git-rebase--am.sh')
| -rw-r--r-- | git-rebase--am.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 1cdc13944c..ca20e1e66f 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -17,7 +17,8 @@ git_rebase__am () { case "$action" in continue) - git am --resolved --resolvemsg="$resolvemsg" && + git am --resolved --resolvemsg="$resolvemsg" \ + ${gpg_sign_opt:+"$gpg_sign_opt"} && move_to_original_branch return ;; @@ -37,7 +38,7 @@ then # empty commits and even if it didn't the format doesn't really lend # itself well to recording empty patches. fortunately, cherry-pick # makes this easy - git cherry-pick --allow-empty "$revisions" + git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} --allow-empty "$revisions" ret=$? else rm -f "$GIT_DIR/rebased-patches" @@ -71,7 +72,8 @@ else return $? fi - git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" <"$GIT_DIR/rebased-patches" + git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \ + ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches" ret=$? rm -f "$GIT_DIR/rebased-patches" |