From acb46f8769dd0031a98a284e06ebc5a09b151bfd Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 8 Jul 2005 10:45:07 -0700 Subject: git-diff-*: support "-u" as a synonym for "-p" I'm probably not the only one whose fingers have gotten hard-wired to use "-u" for "unified diff". --- diff-cache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'diff-cache.c') diff --git a/diff-cache.c b/diff-cache.c index 603a6b777..33b3b3177 100644 --- a/diff-cache.c +++ b/diff-cache.c @@ -193,7 +193,8 @@ int main(int argc, const char **argv) /* We accept the -r flag just to look like git-diff-tree */ continue; } - if (!strcmp(arg, "-p")) { + /* We accept the -u flag as a synonym for "-p" */ + if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) { diff_output_format = DIFF_FORMAT_PATCH; continue; } -- cgit v1.2.1