| commit | acb46f8769dd0031a98a284e06ebc5a09b151bfd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jul 08 10:45:07 2005 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jul 08 10:45:07 2005 -0700 |
| tree | 82bd6a6997dd6a7e5442a2cc306bb0feaf7e8ea0 | |
| parent | 0acfc9725287d21ab7478020b66f39d7ea511804 [diff] [blame] |
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 --git a/diff-files.c b/diff-files.c index 4d60017..3221e31 100644 --- a/diff-files.c +++ b/diff-files.c
@@ -45,7 +45,7 @@ int i; while (1 < argc && argv[1][0] == '-') { - if (!strcmp(argv[1], "-p")) + if (!strcmp(argv[1], "-p") || !strcmp(argv[1], "-u")) diff_output_format = DIFF_FORMAT_PATCH; else if (!strcmp(argv[1], "-q")) silent = 1;