diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:47 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:31 -0800 |
| commit | d9b1bc6d13f6581f1e91f21d20b50b7312c60e62 (patch) | |
| tree | 2303fcbfecf6682a85bd808f320d7a59ee1070c4 | |
| parent | diff-merges: split 'ignore_merges' field (diff) | |
| download | git-d9b1bc6d13f6581f1e91f21d20b50b7312c60e62.tar.gz git-d9b1bc6d13f6581f1e91f21d20b50b7312c60e62.zip | |
diff-merges: group diff-merge flags next to each other inside 'rev_info'
The relevant flags were somewhat scattered over definition of 'struct
rev_info'. Rearrange them to group them together.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | revision.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/revision.h b/revision.h index fcc532c873..dcfa14454a 100644 --- a/revision.h +++ b/revision.h @@ -191,13 +191,14 @@ struct rev_info { match_missing:1, no_commit_id:1, verbose_header:1, + always_show_header:1, + /* Diff-merge flags */ 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; + first_parent_merges:1; /* Format info */ int show_notes; |