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>

diff --git a/diff-merges.c b/diff-merges.c
index ee91ed0db40978b510f6cf3af81e4a59c16373e4..011bfff1f1350198a7867f70f1da4d68415e053c 100644 (file)
--- 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);