From 63ac4501199ca768e95ad3442f6580e41a002a33 Mon Sep 17 00:00:00 2001 From: Stephan Feder Date: Fri, 7 Jul 2006 15:57:07 +0200 Subject: [PATCH] Teach diff -a as shorthand for --text Signed-off-by: Stephan Feder Signed-off-by: Junio C Hamano --- diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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")) -- 2.26.2