Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] diff-stages: support "-u" as a synonym for "-p".
author
Junio C Hamano
<junkio@cox.net>
Wed, 13 Jul 2005 19:45:06 +0000
(12:45 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 13 Jul 2005 19:55:07 +0000
(12:55 -0700)
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>
diff-stages.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
d6d8dac
)
diff --git
a/diff-stages.c
b/diff-stages.c
index 9d8cc73e67165e685b6938172ca7dc68330ed31b..738fe5d987352528c407adba1f50c030dc1674e1 100644
(file)
--- 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)