summaryrefslogtreecommitdiff
path: root/diff-merges.c
diff options
context:
space:
mode:
Diffstat (limited to 'diff-merges.c')
-rw-r--r--diff-merges.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/diff-merges.c b/diff-merges.c
index b8fd92adcf..e3c0190ebd 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -8,6 +8,7 @@ static void suppress(struct rev_info *revs)
revs->first_parent_merges = 0;
revs->combine_merges = 0;
revs->dense_combined_merges = 0;
+ revs->combined_all_paths = 0;
}
static void set_separate(struct rev_info *revs)
@@ -29,12 +30,14 @@ static void set_m(struct rev_info *revs)
static void set_combined(struct rev_info *revs)
{
+ suppress(revs);
revs->combine_merges = 1;
revs->dense_combined_merges = 0;
}
static void set_dense_combined(struct rev_info *revs)
{
+ suppress(revs);
revs->combine_merges = 1;
revs->dense_combined_merges = 1;
}