[PATCH v3 27/32] diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
STALE2114d
From: Sergey Organov <hidden>
Date: 2020-12-21 18:39:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v3 of 3 in this series.
Revisions (3)
- v1 [diff vs current]
- v2 [diff vs current]
- v3 current
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 <redacted>
---
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