Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more

[thirdparty/git.git] / sequencer.h

diff --git a/sequencer.h b/sequencer.h
index c53519d9c0c0c5881c1f62e757ae48a24699fcae..5ed5cb1d97ced70a9ebffd1dad524a12e7f7810a 100644 (file)
--- 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;