From: Sergey Organov Date: Mon, 21 Dec 2020 15:19:54 +0000 (+0300) Subject: diff-merges: add old mnemonic counterparts to --diff-merges X-Git-Tag: v2.31.0-rc0~84^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5071c7531692f53cdfec43542f1cbaee573fd2be;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/diff-merges.c b/diff-merges.c index ee91ed0db4..011bfff1f1 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -60,11 +60,11 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg) if (!strcmp(optarg, "first-parent")) set_first_parent(revs); - else if (!strcmp(optarg, "separate")) + else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate")) set_separate(revs); - else if (!strcmp(optarg, "combined")) + else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined")) set_combined(revs); - else if (!strcmp(optarg, "dense-combined")) + else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined")) set_dense_combined(revs); else die(_("unknown value for --diff-merges: %s"), optarg);