Teach diff -a as shorthand for --text

Stephan Feder · Junio C Hamano · commit 63ac4501199c · 2006-07-07T12:28:04.000-07:00
Signed-off-by: Stephan Feder &lt;sf@b-i-t.de&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git 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"))

Original file line number	Diff line number	Diff line change
`@@ -1561,7 +1561,7 @@ int diff_opt_parse(struct diff_options options, const char *av, int ac)`
`1561`	`1561`	`options->output_format \|= DIFF_FORMAT_PATCH;`
`1562`	`1562`	`options->full_index = options->binary = 1;`
`1563`	`1563`	`}`
`1564`		`- else if (!strcmp(arg, "--text")) {`
	`1564`	`+ else if (!strcmp(arg, "-a") \|\| !strcmp(arg, "--text")) {`
`1565`	`1565`	`options->text = 1;`
`1566`	`1566`	`}`
`1567`	`1567`	`else if (!strcmp(arg, "--name-only"))`