diff options
author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:55 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:32 -0800 |
commit | 388091fe4d9e06475f491c195e84e1996aad3f42 (patch) | |
tree | 39b98153a78ca8153ba7089ee4882e398bdd9467 | |
parent | diff-merges: add old mnemonic counterparts to --diff-merges (diff) | |
download | tgif-388091fe4d9e06475f491c195e84e1996aad3f42.tar.xz |
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 <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | diff-merges.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-merges.c b/diff-merges.c index 011bfff1f1..146bb50316 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -58,7 +58,7 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg) return; } - if (!strcmp(optarg, "first-parent")) + if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent")) set_first_parent(revs); else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate")) set_separate(revs); |