From fd16a39944ce2f2967ed015379f5bd05bac639bb Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Fri, 21 May 2021 00:47:02 +0300 Subject: diff-merges: rename "combined_imply_patch" to "merges_imply_patch" This is refactoring change in preparation for the next commit that will let -m imply -p. The old name doesn't match the intention to let not only -c/-cc imply -p, but also -m, that is not a "combined" format, so we rename the flag accordingly. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- revision.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'revision.h') diff --git a/revision.h b/revision.h index e6be3c845e..5ea881d189 100644 --- a/revision.h +++ b/revision.h @@ -195,10 +195,10 @@ struct rev_info { /* Diff-merge flags */ explicit_diff_merges: 1, merges_need_diff: 1, + merges_imply_patch:1, separate_merges: 1, combine_merges:1, combined_all_paths:1, - combined_imply_patch:1, dense_combined_merges:1, first_parent_merges:1; -- cgit v1.2.3