Merge git://repo.or.cz/git-gui

diff --git a/revision.h b/revision.h
index 15dc14925ff8c4358af85583b07d13495d5b2cac..f64e8ce7ff999e9fe4a01205ae51775827484ed4 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -12,7 +12,7 @@
 #define CHILD_SHOWN    (1u<<6)
 #define ADDED          (1u<<7) /* Parents already parsed and added? */
 #define SYMMETRIC_LEFT (1u<<8)
-#define TOPOSORT       (1u<<9) /* In the active toposort list.. */
+#define ALL_REV_FLAGS  ((1u<<9)-1)
 
 struct rev_info;
 struct log_info;
@@ -116,6 +116,8 @@ struct rev_info {
 #define REV_TREE_DIFFERENT     2
 
 /* revision.c */
+void read_revisions_from_stdin(struct rev_info *revs);
+
 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
 volatile show_early_output_fn_t show_early_output;