diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:54 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:32 -0800 |
| commit | 5071c7531692f53cdfec43542f1cbaee573fd2be (patch) | |
| tree | 550bb736a52a19547d066228cc31ca8723689cca | |
| parent | diff-merges: let new options enable diff without -p (diff) | |
| download | tgif-5071c7531692f53cdfec43542f1cbaee573fd2be.tar.xz | |
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>
| -rw-r--r-- | diff-merges.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |