Skip to content

Commit 388091f

Browse files
sorganovgitster
authored andcommitted
diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5071c75 commit 388091f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

diff-merges.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
5858
return;
5959
}
6060

61-
if (!strcmp(optarg, "first-parent"))
61+
if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
6262
set_first_parent(revs);
6363
else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate"))
6464
set_separate(revs);

0 commit comments

Comments
 (0)