projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a77754 3bfba20)
Merge branch 'jc/convert'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:47:16 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:47:16 +0000 (16:47 -0700)
commitfb539696861ce2d924245ea34fe3aa467406a495
treea4ae3a85d0e16be3adcfb224bbd8595a8ca33b29tree | snapshot
parent7a77754cf6fde7b513da1283fe76179ffa930ecccommit | diff
parent3bfba20dae16384cb7112268462bd01d30d4a698commit | diff
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"
Git—the stupid content tracker