diff options
author | Sergey Organov <sorganov@gmail.com> | 2021-05-21 00:47:02 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-21 03:24:14 +0300 |
commit | fd16a39944ce2f2967ed015379f5bd05bac639bb (patch) | |
tree | 4a6e70ac59f4019281af3e50dd4fcd70ae61cf06 /revision.h | |
parent | 1e20a407fe28b4bdba3b973b26b0b60ff6b6c97d (diff) |
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 <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
-rw-r--r-- | revision.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |