summaryrefslogtreecommitdiff
path: root/git-rebase--am.sh
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mars-attacks.org>2014-02-10 01:03:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-02-11 22:48:20 (GMT)
commit3ee5e54038fd32ee60b24ebd385981aeb14b80a5 (patch)
treebcd03b18bcef2a27653fe317cdeadf60c440e348 /git-rebase--am.sh
parentb6e9e73e8af20c2301595d58087ad58a9df05725 (diff)
downloadgit-3ee5e54038fd32ee60b24ebd385981aeb14b80a5.zip
git-3ee5e54038fd32ee60b24ebd385981aeb14b80a5.tar.gz
git-3ee5e54038fd32ee60b24ebd385981aeb14b80a5.tar.bz2
rebase: add the --gpg-sign option
Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--am.sh')
-rw-r--r--git-rebase--am.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index a4f683a..df46f4c 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -6,7 +6,8 @@
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
;;
@@ -26,7 +27,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"
@@ -60,7 +61,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"