summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--revision.h5
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;