diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:46 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:31 -0800 |
| commit | 1a2c4d80501c50fbe96cc0be096273703a5c0d16 (patch) | |
| tree | 51d730f3d84d0c21960f28a3dfeaa41597d88cac /banned.h | |
| parent | diff-merges: fix -m to properly override -c/--cc (diff) | |
| download | tgif-1a2c4d80501c50fbe96cc0be096273703a5c0d16.tar.xz | |
diff-merges: split 'ignore_merges' field
'ignore_merges' was 3-way field that served two distinct purposes that
we now assign to 2 new independent flags: 'separate_merges', and
'explicit_diff_merges'.
'separate_merges' tells that we need to output diff format containing
separate diff for every parent (as opposed to 'combine_merges').
'explicit_diff_merges' tells that at least one of diff-merges options
has been explicitly specified on the command line, so no defaults
should apply.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'banned.h')
0 files changed, 0 insertions, 0 deletions