| commit | 7f5885ad2abfbf9b760e2f32f70537d1c380734d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Sep 2016 04:35:51 +0000 (8 21:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Sep 2016 04:35:52 +0000 (8 21:35 -0700) | ||
| tree | f2a636bb35db7ea784c2ae08259cfca6bfb6a1a6 | treesnapshot (tar.gz zip) |
| parent | faacc8efe503a470c0c549c7949824728d7f1461 | commitdiff |
| parent | 1335d76e4569fa84e52dc24c88c04daeae6e160e | commitdiff |
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
"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