Merge branch 'tb/add-renormalize'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:37 +0000 (11:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:37 +0000 (11:06 +0900)
"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"

1  2 
builtin/add.c
cache.h
read-cache.c
sha1_file.c

diff --cc builtin/add.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc sha1_file.c
Simple merge