summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--diff-merges.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-merges.c b/diff-merges.c
index 011bfff1f1..146bb50316 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -58,7 +58,7 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
return;
}
- if (!strcmp(optarg, "first-parent"))
+ if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
set_first_parent(revs);
else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate"))
set_separate(revs);