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@xxxxxxxxx>
---
diff-merges.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/diff-merges.c b/diff-merges.c
index ffe20d8daa4a..9492cd2b871d 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -59,11 +59,14 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
if (0) ;
else if (!strcmp(optarg, "first") || !strcmp(optarg, "first-parent"))
set_first_parent(revs);
- else if (!strcmp(optarg, "sep") || !strcmp(optarg, "separate"))
+ else if (!strcmp(optarg, "sep") || !strcmp(optarg, "separate") ||
+ !strcmp(optarg, "m"))
set_separate(revs);
- else if (!strcmp(optarg, "comb") || !strcmp(optarg, "combined"))
+ else if (!strcmp(optarg, "comb") || !strcmp(optarg, "combined") ||
+ !strcmp(optarg, "c"))
set_combined(revs);
- else if (!strcmp(optarg, "dense") || !strcmp(optarg, "dense-combined"))
+ else if (!strcmp(optarg, "dense") || !strcmp(optarg, "dense-combined") ||
+ !strcmp(optarg, "cc"))
set_dense_combined(revs);
else
die(_("unknown value for --diff-merges: %s"), optarg);
--
2.25.1
