Merge branch 'tb/crlf-conv-flags' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Feb 2018 22:55:51 +0000 (14:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Feb 2018 22:55:52 +0000 (14:55 -0800)
commit1981be1b46aec05ec10d9097a5a12b75c8d9742e
tree160acf5d402bc4a638fbaa5ad7d16dc228e08f88
parentb5383e2d052ae1f6f1fe5e286424453054b88164
parent8462ff43e42ab67cecd16fdfb59451a53cc8a945
Merge branch 'tb/crlf-conv-flags' into next

Code clean-up.

* tb/crlf-conv-flags:
  convert_to_git(): safe_crlf/checksafe becomes int conv_flags
combine-diff.c
config.c
diff.c
environment.c
sha1_file.c