diff-merges: add old mnemonic counterparts to --diff-merges
This adds --diff-merges={m|c|cc} values that match mnemonics of old options, for those who are used to them. Note that, say, --diff-meres=cc behaves differently than --cc, as the latter implies -p and therefore enables diffs for all the commits, while the former enables output of diffs for merge commits only. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Dec 21, 2020 at 18:19 UTC
5071c7531692f53cdfec43542f1cbaee573fd2be
1 file changed
+3
-3
diff-merges.c
+3
-3
@@ -60,11 +60,11 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
60
61
if (!strcmp(optarg, "first-parent"))
62
set_first_parent(revs);
63
- else if (!strcmp(optarg, "separate"))
63
+ else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate"))
64
set_separate(revs);
65
- else if (!strcmp(optarg, "combined"))
65
+ else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
66
set_combined(revs);
67
- else if (!strcmp(optarg, "dense-combined"))
67
+ else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
68
set_dense_combined(revs);
69
else
70
die(_("unknown value for --diff-merges: %s"), optarg);