From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: [PATCH] diff-stages: support "-u" as a synonym for "-p".
Date: Wed, 13 Jul 2005 12:45:06 -0700 [thread overview]
Message-ID: <7vll4aze0t.fsf_-_@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <loom.20050712T224801-163@post.gmane.org> (Junio C. Hamano's message of "Tue, 12 Jul 2005 20:51:17 +0000 (UTC)")
Just to be consistent, support "-u" as a synonym for "-p" like
everybody else does.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
diff-stages.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
ef519b28e8edb19d4a0233152c9497ee807a4f5b
diff --git a/diff-stages.c b/diff-stages.c
--- 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)
next prev parent reply other threads:[~2005-07-13 20:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-12 5:52 Why is there no git-update-cache --modified (aka I give up) Marc Singer
2005-07-12 7:26 ` Petr Baudis
2005-07-12 8:14 ` Junio C Hamano
2005-07-12 15:53 ` Marc Singer
2005-07-12 16:16 ` Matthias Urlichs
2005-07-12 20:51 ` Junio C Hamano
2005-07-13 19:45 ` Junio C Hamano [this message]
2005-07-13 19:45 ` [PATCH] git-diff-*: --name-only and --name-only-z Junio C Hamano
2005-07-13 19:52 ` [PATCH] Clean up diff option descriptions Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vll4aze0t.fsf_-_@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).