diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:35 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:30 -0800 |
| commit | 7acf0d06f54043b3b79d5d388ed1c8fb66e2db5a (patch) | |
| tree | 62a61608f95832357632e4b6d9bc17776ab4b684 /builtin/merge.c | |
| parent | 18f09473bf8685a1f8db254cff915d4c31e86406 (diff) | |
diff-merges: move checks for first_parent_only out of the module
The checks for first_parent_only don't in fact belong to this module,
as the primary purpose of this flag is history traversal limiting, so
get it out of this module and rename the
diff_merges_first_parent_defaults_to_enable()
to
diff_merges_default_to_enable()
to match new semantics.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions