diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-22 00:47:31 +0300 |
| commit | 1a2c4d80501c50fbe96cc0be096273703a5c0d16 (patch) | |
| tree | 51d730f3d84d0c21960f28a3dfeaa41597d88cac /revision.h | |
| parent | 6fc944d8956bf75bf2e52a871c02b71b4f9dfcba (diff) | |
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 'revision.h')
| -rw-r--r-- | revision.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.h b/revision.h index ba2aef7921..fcc532c873 100644 --- a/revision.h +++ b/revision.h @@ -191,12 +191,13 @@ struct rev_info { match_missing:1, no_commit_id:1, verbose_header:1, + explicit_diff_merges: 1, + separate_merges: 1, combine_merges:1, combined_all_paths:1, dense_combined_merges:1, first_parent_merges:1, always_show_header:1; - int ignore_merges:2; /* Format info */ int show_notes; |