aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Feder <sf@b-i-t.de>2006-07-07 15:57:07 +0200
committerJunio C Hamano <junkio@cox.net>2006-07-07 12:28:04 -0700
commit63ac4501199ca768e95ad3442f6580e41a002a33 (patch)
tree9f0f6eff068609383617eaec7b476bf2f5a80dd5
parent6d64ea965bc2894ef0aee16ac23a5e47f20eb824 (diff)
downloadgit-63ac4501199ca768e95ad3442f6580e41a002a33.tar.gz
git-63ac4501199ca768e95ad3442f6580e41a002a33.tar.xz
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>
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
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"))