From: Junio C Hamano <junkio@cox.net>
Date: Wed, 13 Jul 2005 19:45:06 +0000 (-0700)
Subject: [PATCH] diff-stages: support "-u" as a synonym for "-p".
X-Git-Tag: v0.99.1~46
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8a62a3097c55b22ee4543edef10322775ef62c92;p=git.git

[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>
---

diff --git a/diff-stages.c b/diff-stages.c
index 9d8cc73e6..738fe5d98 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)