merge-recursive: separate out xdl_merge() interface.

diff --git a/revision.h b/revision.h
index 6ae39e6bec180769df0bccccdf652ad0ffd784f0..8a026184287479272ececf5cf3d5000c52007553 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -46,7 +46,9 @@ struct rev_info {
                        boundary:2,
                        left_right:1,
                        parents:1,
-                       reverse:1;
+                       reverse:1,
+                       cherry_pick:1,
+                       first_parent_only:1;
 
        /* Diff flags */
        unsigned int    diff:1,
@@ -77,6 +79,7 @@ struct rev_info {
        const char      *add_signoff;
        const char      *extra_headers;
        const char      *log_reencode;
+       const char      *subject_prefix;
        int             no_inline;
 
        /* Filter by commit log message */