]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: faacc8e 1335d76)
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)
commit7f5885ad2abfbf9b760e2f32f70537d1c380734d
treef2a636bb35db7ea784c2ae08259cfca6bfb6a1a6tree
parentfaacc8efe503a470c0c549c7949824728d7f1461commit | diff
parent1335d76e4569fa84e52dc24c88c04daeae6e160ecommit | diff
Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint

"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.