ci-bonfire/Bonfire — pull request #573 by sourcejedi (2012-09-09 16:37:20+00:00)
Title: dos2unix, i.e. normalize line endings, using gitattributes

@seandowney This rewrites the content of 25 files, to normalize their end-of-line codes. It would conflict with feature/thirdparty, so here's a multiple choice :).

1. Merging is going to be quite annoying. => Let feature/thirdparty get finished and merged first. git-autocrlf can then be rebased on top. It's no extra effort - completely scripted. And I don't think there's any urgency.
2. You're already confident you have a mergetool that merges line ending conversions automatically, like the kdiff3 tool I use on Linux. => git-autocrlf can be merged straight away.
3. feature/thirdparty is a first draft, and you expect to throw it away and start again. => git-autocrlf can be merged straight away.