Thread (138 messages) 138 messages, 4 authors, 2020-12-21
STALE2010d
Revisions (2)
  1. v2 current
  2. v3 [diff vs current]

[PATCH v2 28/33] diff-merges: add '--diff-merges=1' as synonym for 'first-parent'

From: Sergey Organov <hidden>
Date: 2020-12-16 18:52:09
Subsystem: the rest · Maintainer: Linus Torvalds

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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/diff-merges.c b/diff-merges.c
index 9492cd2b871d..63a0d78b7730 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -57,7 +57,8 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
 		return;
 	}
 	if (0) ;
-	else if (!strcmp(optarg, "first") || !strcmp(optarg, "first-parent"))
+	else if (!strcmp(optarg, "first") || !strcmp(optarg, "first-parent") ||
+		 !strcmp(optarg, "1"))
 		set_first_parent(revs);
 	else if (!strcmp(optarg, "sep")   || !strcmp(optarg, "separate") ||
 		 !strcmp(optarg, "m"))
-- 
2.25.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help