diff options
| author | Sergey Organov <sorganov@gmail.com> | 2023-10-09 19:05:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 22:47:29 +0300 |
| commit | c8e5cb065802e96c5aa5dd25936d9780c5734182 (patch) | |
| tree | 473551f7c17e5282432baf9ead0257f1d9996b53 /diff-merges.c | |
| parent | be3820c60cc82e0ded1d3f3dcc19fbd59ce56aa2 (diff) | |
diff-merges: introduce '--dd' option
This option provides a shortcut to request diff with respect to first
parent for any kind of commit, universally. It's implemented as pure
synonym for "--diff-merges=first-parent --patch".
Gives user quick and universal way to see what changes, exactly, were
brought to a branch by merges as well as by regular commits.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.c')
| -rw-r--r-- | diff-merges.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/diff-merges.c b/diff-merges.c index ec97616db1..45507588a2 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -131,6 +131,9 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) } else if (!strcmp(arg, "--cc")) { set_dense_combined(revs); revs->merges_imply_patch = 1; + } else if (!strcmp(arg, "--dd")) { + set_first_parent(revs); + revs->merges_imply_patch = 1; } else if (!strcmp(arg, "--remerge-diff")) { set_remerge_diff(revs); revs->merges_imply_patch = 1; |