[PATCH 1/3] Teach diff -a as shorthand for --text

From: Stephan Feder <sf@b-i-t.de>
Date: Jul 7, 2006, 13:57 UTC
Message-ID: <11522806291956-git-send-email-sf@b-i-t.de>
In-Reply-To: <44AE4B35.6060607@b-i-t.de>

Signed-off-by: Stephan Feder <sf@b-i-t.de>
---
 diff.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/diff.c b/diff.c
index 1f0219d..b423491 100644
--- a/diff.c
+++ b/diff.c
@@ -1561,7 +1561,7 @@ int diff_opt_parse(struct diff_options *
 		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"))

-- 
1.4.1.gbc483