diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 16:19:40 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 22:47:31 +0100 |
| commit | 3291eea3104e1a1aa64181671da3f9551ec3d59f (patch) | |
| tree | e0b5e5a4361199ff54689f33ec07a5a60fdd0e6d /revision.h | |
| parent | diff-merges: new function diff_merges_set_dense_combined_if_unset() (diff) | |
| download | git-3291eea3104e1a1aa64181671da3f9551ec3d59f.tar.xz git-3291eea3104e1a1aa64181671da3f9551ec3d59f.zip | |
diff-merges: introduce revs->first_parent_merges flag
This new field allows us to separate format of diff for merges from
'first_parent_only' flag which primary purpose is limiting history
traversal.
This change further localizes diff format selection logic into the
diff-merges.c file.
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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.h b/revision.h index f6bf860d19..ba2aef7921 100644 --- a/revision.h +++ b/revision.h @@ -194,6 +194,7 @@ struct rev_info { combine_merges:1, combined_all_paths:1, dense_combined_merges:1, + first_parent_merges:1, always_show_header:1; int ignore_merges:2; |