diff --git a/revision.h b/revision.h
index d93481f68f53a657fe4b174e4a12777efe6a74bb..55e6b531ce3e5838f988ca1896484333e795f192 100644 (file)
--- a/revision.h
+++ b/revision.h
#define SHOWN (1u<<3)
#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
#define BOUNDARY (1u<<5)
#define SHOWN (1u<<3)
#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
#define BOUNDARY (1u<<5)
-#define BOUNDARY_SHOW (1u<<6)
+#define CHILD_SHOWN (1u<<6)
#define ADDED (1u<<7) /* Parents already parsed and added? */
#define SYMMETRIC_LEFT (1u<<8)
#define ADDED (1u<<7) /* Parents already parsed and added? */
#define SYMMETRIC_LEFT (1u<<8)
struct commit_list *commits;
struct object_array pending;
struct commit_list *commits;
struct object_array pending;
+ /* Parents of shown commits */
+ struct object_array boundary_commits;
+
/* Basic information */
const char *prefix;
void *prune_data;
/* Basic information */
const char *prefix;
void *prune_data;
edge_hint:1,
limited:1,
unpacked:1, /* see also ignore_packed below */
edge_hint:1,
limited:1,
unpacked:1, /* see also ignore_packed below */
- boundary:1,
+ boundary:2,
left_right:1,
left_right:1,
- parents:1;
+ parents:1,
+ reverse:1,
+ first_parent_only:1;
/* Diff flags */
unsigned int diff:1,
/* Diff flags */
unsigned int diff:1,
const char *add_signoff;
const char *extra_headers;
const char *log_reencode;
const char *add_signoff;
const char *extra_headers;
const char *log_reencode;
+ int no_inline;
/* Filter by commit log message */
struct grep_opt *grep_filter;
/* Filter by commit log message */
struct grep_opt *grep_filter;