[PATCH v3 19/32] diff-merges: group diff-merge flags next to each other inside 'rev_info'
STALE2110d
From: Sergey Organov <hidden>
Date: 2020-12-21 18:13:39
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v3 of 4 in this series.
Revisions (4)
- v1 [diff vs current]
- v1 [diff vs current]
- v2 [diff vs current]
- v3 current
The relevant flags were somewhat scattered over definition of 'struct rev_info'. Rearrange them to group them together. Signed-off-by: Sergey Organov <redacted> --- revision.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/revision.h b/revision.h
index fcc532c873d1..dcfa14454a55 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;
--
2.25.1