summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/revision.h b/revision.h
index 91f194478b..7cf848771b 100644
--- a/revision.h
+++ b/revision.h
@@ -42,6 +42,8 @@ struct rev_info {
simplify_history:1,
lifo:1,
topo_order:1,
+ simplify_merges:1,
+ simplify_by_decoration:1,
tag_objects:1,
tree_objects:1,
blob_objects:1,
@@ -52,7 +54,10 @@ struct rev_info {
left_right:1,
rewrite_parents:1,
print_parents:1,
+ show_source:1,
+ show_decorations:1,
reverse:1,
+ reverse_output_stage:1,
cherry_pick:1,
first_parent_only:1;
@@ -110,6 +115,7 @@ struct rev_info {
struct reflog_walk_info *reflog_info;
struct decoration children;
+ struct decoration merge_simplification;
};
#define REV_TREE_SAME 0