diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-08 17:45:07 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-08 17:45:07 (GMT) |
| commit | acb46f8769dd0031a98a284e06ebc5a09b151bfd (patch) | |
| tree | 82bd6a6997dd6a7e5442a2cc306bb0feaf7e8ea0 /diff-tree.c | |
| parent | 0acfc9725287d21ab7478020b66f39d7ea511804 (diff) | |
| download | git-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-tree.c')
| -rw-r--r-- | diff-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c index 60ad2b5..ea23705 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; |