]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
merge-recursive: introduce an enum for detect_directory_renames values
authorDerrick Stolee <dstolee@microsoft.com>
Sat, 17 Aug 2019 18:41:25 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Aug 2019 17:08:03 +0000 (10:08 -0700)
commit8e01251694fa277df53e5c52c137f0b4134d2cd5
tree83841c6049011be15ce34aed8f0fb7564725f9dc
parent743474cbfa8b65016dd02b4e56dd9f47f95652c3
merge-recursive: introduce an enum for detect_directory_renames values

Improve code readability by introducing an enum to replace the
not-quite-boolean values taken on by detect_directory_renames.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/am.c
merge-recursive.c
merge-recursive.h