From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 May 2011 23:47:16 +0000 (-0700)
Subject: Merge branch 'jc/convert'
X-Git-Tag: v1.7.6-rc0~63
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fb539696861ce2d924245ea34fe3aa467406a495;p=git.git

Merge branch 'jc/convert'

* jc/convert:
  convert: make it harder to screw up adding a conversion attribute
  convert: make it safer to add conversion attributes
  convert: give saner names to crlf/eol variables, types and functions
  convert: rename the "eol" global variable to "core_eol"
---

fb539696861ce2d924245ea34fe3aa467406a495