Merge branch 'rs/discard-index-discard-array' into maint

diff --git a/revision.h b/revision.h
index 5da09ee3efa976b503cba5d13e347aad0f6c764c..878a5556fd5e1c82f0fc35e1669e33623397ceeb 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -35,6 +35,7 @@ struct rev_cmdline_info {
                        REV_CMD_PARENTS_ONLY,
                        REV_CMD_LEFT,
                        REV_CMD_RIGHT,
+                       REV_CMD_MERGE_BASE,
                        REV_CMD_REV
                } whence;
                unsigned flags;
@@ -138,7 +139,7 @@ struct rev_info {
        int             reroll_count;
        char            *message_id;
        struct string_list *ref_message_ids;
-       const char      *add_signoff;
+       int             add_signoff;
        const char      *extra_headers;
        const char      *log_reencode;
        const char      *subject_prefix;