Merge branch 'tb/crlf-conv-flags'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:08 +0000 (13:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:08 +0000 (13:39 -0800)
commit9bc89b17e36db31a54bc3ff16e48b5cb6beb095b
tree160acf5d402bc4a638fbaa5ad7d16dc228e08f88
parent8fe806bcd5ac621e22982c73306e94d26e56cf79
parent8462ff43e42ab67cecd16fdfb59451a53cc8a945
Merge branch 'tb/crlf-conv-flags'

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