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>
Sergey Organov committed
Dec 21, 2020 at 18:19 UTC
d9b1bc6d13f6581f1e91f21d20b50b7312c60e62
1 file changed
+3
-2
revision.h
+3
-2
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;