Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/revision.h b/revision.h
index 55e6b531ce3e5838f988ca1896484333e795f192..2845167746ce4632894fce88e840df60513933aa 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -47,6 +47,7 @@ struct rev_info {
                        left_right:1,
                        parents:1,
                        reverse:1,
+                       cherry_pick:1,
                        first_parent_only:1;
 
        /* Diff flags */
@@ -62,8 +63,8 @@ struct rev_info {
 
        /* Format info */
        unsigned int    shown_one:1,
-                       abbrev_commit:1,
-                       relative_date:1;
+                       abbrev_commit:1;
+       enum date_mode date_mode;
 
        const char **ignore_packed; /* pretend objects in these are unpacked */
        int num_ignore_packed;
@@ -78,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 */
@@ -111,7 +113,7 @@ extern void init_revisions(struct rev_info *revs, const char *prefix);
 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
 extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
 
-extern void prepare_revision_walk(struct rev_info *revs);
+extern int prepare_revision_walk(struct rev_info *revs);
 extern struct commit *get_revision(struct rev_info *revs);
 
 extern void mark_parents_uninteresting(struct commit *commit);
@@ -129,5 +131,6 @@ extern void add_object(struct object *obj,
                       const char *name);
 
 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
+extern void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode);
 
 #endif