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>
This commit is contained in:
parent
6d64ea965b
commit
63ac450119
2
diff.c
2
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"))
|
||||
|
Loading…
Reference in New Issue
Block a user