Files
git/Documentation
Junio C Hamano 21bed620cd 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
2016-07-25 14:13:39 -07:00
..
2016-07-19 13:26:16 -07:00
2016-07-13 11:24:14 -07:00
2016-07-13 11:24:14 -07:00
2016-07-13 11:24:14 -07:00
2016-07-13 11:24:14 -07:00
2016-07-13 11:24:14 -07:00
2016-07-13 11:24:14 -07:00
2016-07-13 11:24:14 -07:00
2016-07-13 11:24:14 -07:00
2016-07-13 11:24:14 -07:00
2015-07-21 14:08:14 -07:00
2016-07-13 11:24:14 -07:00
2015-10-05 12:30:13 -07:00
2016-07-13 11:24:14 -07:00
2016-07-13 11:24:14 -07:00
2016-07-13 11:24:14 -07:00
2016-07-15 10:49:23 -07:00
2016-03-03 13:43:36 -08:00