Code

Merge branch 'sp/safecrlf'
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 01:59:20 +0000 (17:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 01:59:20 +0000 (17:59 -0800)
commit2ac4b4b2228f3ef996db7b07aea74c4b1a796f38
tree245c7610f3a42fef9d63a883a281dc8e3efffe8a
parent990732609ce735c482e571ad95767edf1d693b41
parent21e5ad50fc5e7277c74cfbb3cf6502468e840f86
Merge branch 'sp/safecrlf'

* sp/safecrlf:
  safecrlf: Add mechanism to warn about irreversible crlf conversions
Documentation/config.txt
builtin-apply.c
builtin-blame.c
cache.h
config.c
convert.c
diff.c
environment.c