kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Sergey Organov 2020-12-21 18:19:54 +03:00 committed by Junio C Hamano
parent a6d19ecc6b
commit 5071c75316
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diff-merges.c
View File

@ -60,11 +60,11 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)


if (!strcmp(optarg, "first-parent")) if (!strcmp(optarg, "first-parent"))
set_first_parent(revs); set_first_parent(revs);
else if (!strcmp(optarg, "separate")) else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate"))
set_separate(revs); set_separate(revs);
else if (!strcmp(optarg, "combined")) else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
set_combined(revs); set_combined(revs);
else if (!strcmp(optarg, "dense-combined")) else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
set_dense_combined(revs); set_dense_combined(revs);
else else
die(_("unknown value for --diff-merges: %s"), optarg); die(_("unknown value for --diff-merges: %s"), optarg);