Files
git/Documentation
Junio C Hamano 7f5885ad2a 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
2016-09-08 21:35:52 -07:00
..
2016-08-12 09:17:51 -07:00
2016-07-28 11:25:54 -07:00
2015-07-21 14:08:14 -07:00
2015-10-05 12:30:13 -07:00
2016-08-12 09:17:51 -07:00
2016-03-03 13:43:36 -08:00