cherry-pick, revert: 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>
2014-01-24 00:50:58 +00:00
parent bd3e186d81
commit 3253553e12
5 changed files with 26 additions and 2 deletions
--- a/sequencer.h
+++ b/sequencer.h
@ -37,6 +37,8 @@ struct replay_opts {

 	int mainline;

+	const char *gpg_sign;
+
 	/* Merge strategy */
 	const char *strategy;
 	const char **xopts;