summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mars-attacks.org>2014-02-10 01:03:37 +0000
committerJunio C Hamano <gitster@pobox.com>2014-02-11 14:48:20 -0800
commit3ee5e54038fd32ee60b24ebd385981aeb14b80a5 (patch)
treebcd03b18bcef2a27653fe317cdeadf60c440e348 /git-rebase--merge.sh
parentb6e9e73e8af20c2301595d58087ad58a9df05725 (diff)
downloadgit-3ee5e54038fd32ee60b24ebd385981aeb14b80a5.tar.gz
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--merge.sh')
-rw-r--r--git-rebase--merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index e7d96de9ad..5381857c59 100644
--- 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: "