Merge branch 'tb/add-renormalize'
commitaf6e0fe3a589d58bfd508c1c6ccbeb38586eb06b
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:37 +0000 (27 11:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:37 +0000 (27 11:06 +0900)
tree62cd50065b0a90efb4339ee10e66aade7f3e94f3
parent93bfe62ae3fa31429df25daf243f9778d9b929b9
parent9472935d81eaf9faed771878c9df0216ae0d9045
Merge branch 'tb/add-renormalize'

"git add --renormalize ." is a new and safer way to record the fact
that you are correcting the end-of-line convention and other
"convert_to_git()" glitches in the in-repository data.

* tb/add-renormalize:
  add: introduce "--renormalize"
builtin/add.c
cache.h
read-cache.c
sha1_file.c