diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:32 -0800 |
| commit | a6d19ecc6b7715b50b0dced7e3d2923a8797df64 (patch) | |
| tree | b6006ef2c22a5e80f455926183584733d4d8357e /builtin/diff.c | |
| parent | 5733b20f41ac0fecdacdf34a11acef2d03fac829 (diff) | |
diff-merges: let new options enable diff without -p
New options don't have any visible effect unless -p is either given or
implied, as unlike -c/-cc we don't imply -p with --diff-merges. To fix
this, this patch adds new functionality by letting new options enable
output of diffs for merge commits only.
Add 'merges_need_diff' field and set it whenever diff output for merges is
enabled by any of the new options.
Extend diff output logic accordingly, to output diffs for merges when
'merges_need_diff' is set even when no -p has been provided.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions