diff --git a/revision.h b/revision.h
index 91f194478bb91d381ab2b2440215144d8bb8d18d..7cf848771b5be811f7741ce988b860760202f6f3 100644 (file)
--- a/revision.h
+++ b/revision.h
simplify_history:1,
lifo:1,
topo_order:1,
+ simplify_merges:1,
+ simplify_by_decoration:1,
tag_objects:1,
tree_objects:1,
blob_objects:1,
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;
struct reflog_walk_info *reflog_info;
struct decoration children;
+ struct decoration merge_simplification;
};
#define REV_TREE_SAME 0