summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorEyvind Bernhardsen <eyvind.bernhardsen@gmail.com>2010-05-19 22:43:11 +0200
committerJunio C Hamano <gitster@pobox.com>2010-05-19 20:42:34 -0700
commit5ec3e67052289217c84e53d2cda90d939ac5725b (patch)
tree925b092d3514202f5bb0af98f9e19dd639f74a99 /attr.c
parentfd6cce9e89ab5ac1125a3b5f5611048ad22379e7 (diff)
downloadgit-5ec3e67052289217c84e53d2cda90d939ac5725b.tar.gz
Rename the "crlf" attribute "text"
As discussed on the list, "crlf" is not an optimal name. Linus suggested "text", which is much better. Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'attr.c')
-rw-r--r--attr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/attr.c b/attr.c
index f5346ed32a..bf00469ecc 100644
--- 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,
};