Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
simplify-merges: drop merge from irrelevant side branch
[gitweb.git]
/
revision.h
diff --git
a/revision.h
b/revision.h
index dfa06b52106da5ac3dfc65676ea5dd043c95d3cf..765ef6c5e2f3bf0fbf84479cf83e0c0e4c82dda4 100644
(file)
--- a/
revision.h
+++ b/
revision.h
@@
-110,6
+110,7
@@
struct rev_info {
struct reflog_walk_info *reflog_info;
struct decoration children;
+ struct decoration merge_simplification;
};
#define REV_TREE_SAME 0