Merge branch 'jc/renormalize-merge-kill-safer-crlf'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:38 +0000 (14:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:39 +0000 (14:13 -0700)
commit21bed62...cd2d4fc4fb3d42447136c9f899ede5bb
tree55fe7e1...4798ec1689d4e3513e81563a0188317fcopy hash to clipboard (tree)
parentfc08d2d...add543b88d7e1573cb4be01adedfed00copy hash to clipboard (diff)
parent1335d76...4569fa84e52dc24c88c04daeae6e160ecopy hash to clipboard (diff)
Documentation/config.txt
Documentation/gitattributes.txt
cache.h
merge-recursive.c
read-cache.c