diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-08 10:45:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-08 10:45:07 -0700 |
| commit | acb46f8769dd0031a98a284e06ebc5a09b151bfd (patch) | |
| tree | 82bd6a6997dd6a7e5442a2cc306bb0feaf7e8ea0 /diff-cache.c | |
| parent | 0acfc9725287d21ab7478020b66f39d7ea511804 (diff) | |
| download | git-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-cache.c')
| -rw-r--r-- | diff-cache.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/diff-cache.c b/diff-cache.c index 603a6b777..33b3b3177 100644 --- a/diff-cache.c +++ b/diff-cache.c @@ -193,7 +193,8 @@ int main(int argc, const char **argv) /* We accept the -r flag just to look like git-diff-tree */ continue; } - if (!strcmp(arg, "-p")) { + /* We accept the -u flag as a synonym for "-p" */ + if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) { diff_output_format = DIFF_FORMAT_PATCH; continue; } |