Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:51 +0000 (21:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:52 +0000 (21:35 -0700)
commit7f5885a...2abfbf9b760e2f32f70537d1c380734d
treef2a636b...35db7ea784c2ae08259cfca6bfb6a1a6copy hash to clipboard (tree)
parentfaacc8e...e503a470c0c549c7949824728d7f1461copy hash to clipboard (diff)
parent1335d76...4569fa84e52dc24c88c04daeae6e160ecopy hash to clipboard (diff)
Documentation/config.txt
Documentation/gitattributes.txt
cache.h
merge-recursive.c
read-cache.c