diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-07-13 19:45:06 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 19:55:07 (GMT) |
| commit | 8a62a3097c55b22ee4543edef10322775ef62c92 (patch) | |
| tree | 3e6f5ff2341c68d1251770fa9fa45ef9dab8d8a3 /diff-stages.c | |
| parent | d6d8dac032e0e0c55b3edffbefd0abb00ca960fc (diff) | |
| download | git-8a62a3097c55b22ee4543edef10322775ef62c92.zip git-8a62a3097c55b22ee4543edef10322775ef62c92.tar.gz git-8a62a3097c55b22ee4543edef10322775ef62c92.tar.bz2 | |
[PATCH] diff-stages: support "-u" as a synonym for "-p".
Just to be consistent, support "-u" as a synonym for "-p" like
everybody else does.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-stages.c')
| -rw-r--r-- | diff-stages.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-stages.c b/diff-stages.c index 9d8cc73..738fe5d 100644 --- a/diff-stages.c +++ b/diff-stages.c @@ -67,7 +67,7 @@ int main(int ac, const char **av) const char *arg = av[1]; if (!strcmp(arg, "-r")) ; /* as usual */ - else if (!strcmp(arg, "-p")) + else if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) diff_output_format = DIFF_FORMAT_PATCH; else if (!strncmp(arg, "-B", 2)) { if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1) |