From: Sergey Organov Date: Sun, 01 Nov 2020 19:33:22 GMT Subject: [PATCH 18/26] diff-merges: group diff-merge flags next to each other inside 'rev_info' Message-ID: <20201101193330.24775-19-sorganov@gmail.com> In-Reply-To: <20201101193330.24775-1-sorganov@gmail.com> The relevant flags were somewhat scattered over definition of 'struct rev_info'. Rearrange them to group them together. Signed-off-by: Sergey Organov --- 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