Merge branch 'eb/core-eol'

* eb/core-eol: Add "core.eol" config variable Rename the "crlf" attribute "text" Add per-repository eol normalization Add tests for per-repository eol normalization Conflicts: Documentation/config.txt Makefile
2010-06-21 06:02:49 -07:00
parent d249515f29 942e774767
commit d5cff17eda
12 changed files with 570 additions and 110 deletions
--- a/attr.c
+++ b/attr.c
@ -287,7 +287,7 @@ static void free_attr_elem(struct attr_stack *e)
 }

 static const char *builtin_attr[] = {
-	"[attr]binary -diff -crlf",
+	"[attr]binary -diff -text",
 	NULL,
 };