undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff-merges: add '--diff-merges=1' as synonym for 'first-parent'

Browse Source 
As we now have --diff-merges={m|c|cc}, add --diff-merges=1 as synonym
for --diff-merges=first-parent, to have shorter mnemonics for it as
well.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sergey Organov 2020-12-21 18:19:55 +03:00 committed by Junio C Hamano
parent 5071c75316
commit 388091fe4d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff-merges.c
View File

@ -58,7 +58,7 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
return; return;
} }
if (!strcmp(optarg, "first-parent")) if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
set_first_parent(revs); set_first_parent(revs);
else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate")) else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate"))
set_separate(revs); set_separate(revs);