projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fc08d2d 1335d76)
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)
commit21bed620cd2d4fc4fb3d42447136c9f899ede5bb
tree55fe7e104798ec1689d4e3513e81563a0188317ftree | snapshot
parentfc08d2d4add543b88d7e1573cb4be01adedfed00commit | diff
parent1335d76e4569fa84e52dc24c88c04daeae6e160ecommit | diff
Merge branch 'jc/renormalize-merge-kill-safer-crlf'

"git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.

* jc/renormalize-merge-kill-safer-crlf:
  merge: avoid "safer crlf" during recording of merge results
  convert: unify the "auto" handling of CRLF
Documentation/config.txt diff1 | diff2 | blob | history
Documentation/gitattributes.txt diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
read-cache.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.