From: Stephan Feder <sf@b-i-t.de>
Date: Fri, 7 Jul 2006 13:57:07 +0000 (+0200)
Subject: Teach diff -a as shorthand for --text
X-Git-Tag: v1.4.2-rc1~58^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=63ac4501199ca768e95ad3442f6580e41a002a33;p=git.git

Teach diff -a as shorthand for --text

Signed-off-by: Stephan Feder <sf@b-i-t.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/diff.c b/diff.c
index 1f0219dbe..b423491f6 100644
--- a/diff.c
+++ b/diff.c
@@ -1561,7 +1561,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
 		options->output_format |= DIFF_FORMAT_PATCH;
 		options->full_index = options->binary = 1;
 	}
-	else if (!strcmp(arg, "--text")) {
+	else if (!strcmp(arg, "-a") || !strcmp(arg, "--text")) {
 		options->text = 1;
 	}
 	else if (!strcmp(arg, "--name-only"))