summaryrefslogtreecommitdiff
path: root/diff-files.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-08 17:45:07 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-08 17:45:07 (GMT)
commitacb46f8769dd0031a98a284e06ebc5a09b151bfd (patch)
tree82bd6a6997dd6a7e5442a2cc306bb0feaf7e8ea0 /diff-files.c
parent0acfc9725287d21ab7478020b66f39d7ea511804 (diff)
downloadgit-acb46f8769dd0031a98a284e06ebc5a09b151bfd.zip
git-acb46f8769dd0031a98a284e06ebc5a09b151bfd.tar.gz
git-acb46f8769dd0031a98a284e06ebc5a09b151bfd.tar.bz2
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".
Diffstat (limited to 'diff-files.c')
-rw-r--r--diff-files.c2
1 files changed, 1 insertions, 1 deletions
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 main(int argc, const char **argv)
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;