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-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'diff-tree.c') diff --git a/diff-tree.c b/diff-tree.c index 60ad2b5b6c..ea237051ee 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -438,7 +438,7 @@ int main(int argc, const char **argv) diff_setup_opt |= DIFF_SETUP_REVERSE; continue; } - if (!strcmp(arg, "-p")) { + if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) { diff_output_format = DIFF_FORMAT_PATCH; recursive = 1; continue; -- cgit v1.2.1