Allow the user to control the verbosity of merge-recursive.

diff --git a/revision.h b/revision.h
index 4585463a44c9faecdcdf4454b735b1e4ba1335aa..8f7907d7abdb764317612d868f58ab88f7175b59 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -72,11 +72,13 @@ struct rev_info {
        const char      *ref_message_id;
        const char      *add_signoff;
        const char      *extra_headers;
+       const char      *log_reencode;
 
        /* Filter by commit log message */
        struct grep_opt *grep_filter;
 
        /* special limits */
+       int skip_count;
        int max_count;
        unsigned long max_age;
        unsigned long min_age;