aboutsummaryrefslogtreecommitdiff
path: root/diff-tree.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-08 10:45:07 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-08 10:45:07 -0700
commitacb46f8769dd0031a98a284e06ebc5a09b151bfd (patch)
tree82bd6a6997dd6a7e5442a2cc306bb0feaf7e8ea0 /diff-tree.c
parent0acfc9725287d21ab7478020b66f39d7ea511804 (diff)
downloadgit-acb46f8769dd0031a98a284e06ebc5a09b151bfd.tar.gz
git-acb46f8769dd0031a98a284e06ebc5a09b151bfd.tar.xz
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-tree.c')
-rw-r--r--diff-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c
index 60ad2b5b6..ea237051e 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;