summaryrefslogtreecommitdiff
path: root/sequencer.h
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mars-attacks.org>2014-01-24 00:50:58 +0000
committerJunio C Hamano <gitster@pobox.com>2014-01-27 15:15:52 -0800
commit3253553e12d40da3bca818528f49a63c95f43aa3 (patch)
tree2238600ec94e6eca80f1443aa237e6c3f585d293 /sequencer.h
parentbd3e186d811a13d8687584856f345a767e3e4d67 (diff)
downloadgit-3253553e12d40da3bca818528f49a63c95f43aa3.tar.gz
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>
Diffstat (limited to 'sequencer.h')
-rw-r--r--sequencer.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h
index 1fc22dcabe..db43e9cf86 100644
--- 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;