Skip to content

Commit

Permalink
[PATCH] diff-stages: support "-u" as a synonym for "-p".
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano authored and Linus Torvalds committed Jul 13, 2005
1 parent d6d8dac commit 8a62a30
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion diff-stages.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 8a62a30

Please sign in to comment.