| commit | 3253553e12d40da3bca818528f49a63c95f43aa3 | [log] [tgz] |
|---|---|---|
| author | Nicolas Vigier <boklm@mars-attacks.org> | Fri Jan 24 00:50:58 2014 +0000 |
| committer | Junio C Hamano <gitster@pobox.com> | Mon Jan 27 15:15:52 2014 -0800 |
| tree | 2238600ec94e6eca80f1443aa237e6c3f585d293 | |
| parent | bd3e186d811a13d8687584856f345a767e3e4d67 [diff] [blame] |
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>
diff --git a/sequencer.h b/sequencer.h index 1fc22dc..db43e9c 100644 --- a/sequencer.h +++ b/sequencer.h
@@ -37,6 +37,8 @@ int mainline; + const char *gpg_sign; + /* Merge strategy */ const char *strategy; const char **xopts;