From: David Symonds <dsymonds@gmail.com>
To: git@vger.kernel.org, gitster@pobox.com, Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>
Cc: David Symonds <dsymonds@gmail.com>
Subject: [PATCH] git-diff: Add --staged as a synonym for --cached.
Date: Wed, 29 Oct 2008 09:15:36 -0700 [thread overview]
Message-ID: <1225296936-1357-1-git-send-email-dsymonds@gmail.com> (raw)
---
Consider this as a replacement to the previous git-staged series.
Documentation/git-diff.txt | 1 +
builtin-diff.c | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index c53eba5..a2f192f 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -33,6 +33,7 @@ forced by --no-index.
commit relative to the named <commit>. Typically you
would want comparison with the latest commit, so if you
do not give <commit>, it defaults to HEAD.
+ --staged is a synonym of --cached.
'git diff' [--options] <commit> [--] [<path>...]::
diff --git a/builtin-diff.c b/builtin-diff.c
index 2de5834..7ceceeb 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -118,7 +118,7 @@ static int builtin_diff_index(struct rev_info *revs,
int cached = 0;
while (1 < argc) {
const char *arg = argv[1];
- if (!strcmp(arg, "--cached"))
+ if (!strcmp(arg, "--cached") || !strcmp(arg, "--staged"))
cached = 1;
else
usage(builtin_diff_usage);
@@ -320,7 +320,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
const char *arg = argv[i];
if (!strcmp(arg, "--"))
break;
- else if (!strcmp(arg, "--cached")) {
+ else if (!strcmp(arg, "--cached") ||
+ !strcmp(arg, "--staged")) {
add_head_to_pending(&rev);
if (!rev.pending.nr)
die("No HEAD commit to compare with (yet)");
--
1.6.0
next reply other threads:[~2008-10-29 16:17 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-29 16:15 David Symonds [this message]
2008-10-29 16:42 ` [PATCH] git-diff: Add --staged as a synonym for --cached Jeff King
2008-10-29 16:50 ` David Symonds
2008-10-29 17:06 ` Johannes Schindelin
2008-10-29 17:11 ` Jeff King
2008-11-02 8:30 ` Junio C Hamano
2008-11-03 7:04 ` Jeff King
2008-11-02 12:35 ` Björn Steinbrink
2008-11-02 18:30 ` Junio C Hamano
2008-11-02 18:54 ` Björn Steinbrink
2008-11-03 7:14 ` Jeff King
2008-11-10 23:37 ` David Symonds
2008-11-11 0:15 ` Jeff King
2008-11-11 1:11 ` Junio C Hamano
2008-11-11 1:22 ` Jeff King
2008-11-12 0:57 ` Junio C Hamano
2008-11-11 4:04 ` Avery Pennarun
2008-11-11 5:49 ` Miles Bader
2008-11-12 8:33 ` Jeff King
2008-11-12 11:10 ` Johannes Schindelin
2008-11-12 11:06 ` Jeff King
2008-11-12 15:39 ` Avery Pennarun
2008-11-12 19:15 ` Jeff King
2008-11-12 19:29 ` Junio C Hamano
2008-11-12 19:37 ` Jeff King
2008-11-12 19:57 ` Junio C Hamano
2008-11-12 22:39 ` Avery Pennarun
2008-11-12 23:42 ` Junio C Hamano
2008-11-12 15:46 ` Avery Pennarun
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1225296936-1357-1-git-send-email-dsymonds@gmail.com \
--to=dsymonds@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=s-beyer@gmx.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).