From 388091fe4d9e06475f491c195e84e1996aad3f42 Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Mon, 21 Dec 2020 18:19:55 +0300 Subject: [PATCH] diff-merges: add '--diff-merges=1' as synonym for 'first-parent' As we now have --diff-merges={m|c|cc}, add --diff-merges=1 as synonym for --diff-merges=first-parent, to have shorter mnemonics for it as well. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff-merges.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);