[PATCH v3 27/32] diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
- From
Sergey Organov <sorganov@gmail.com>
- Date
- Dec 21, 2020, 15:19 UTC
- Message-ID
- <20201221152000.13134-28-sorganov@gmail.com>
- In-Reply-To
- <20201221152000.13134-1-sorganov@gmail.com>
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 <sorganov@gmail.com> --- diff-merges.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/diff-merges.c b/diff-merges.c index 011bfff1f135..146bb50316a6 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);
-- 2.25.1