From 3ee5e54038fd32ee60b24ebd385981aeb14b80a5 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mars-attacks.org>
Date: Mon, 10 Feb 2014 01:03:37 +0000
Subject: 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>
---
 git-rebase--merge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git-rebase--merge.sh')

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: "
-- 
cgit v1.2.3