diff options
| author | David Symonds <dsymonds@gmail.com> | 2008-10-29 09:15:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-11 14:55:43 -0800 |
| commit | 2baf1850ceb01dfbee862e30f2a69cf6064e13eb (patch) | |
| tree | cae035c295bd03571c99d761538c8b7aba3df13e | |
| parent | 36bd844658cf244ec2c6756c18673a4b7ed8ec9e (diff) | |
| download | git-2baf1850ceb01dfbee862e30f2a69cf6064e13eb.tar.gz git-2baf1850ceb01dfbee862e30f2a69cf6064e13eb.tar.xz | |
git-diff: Add --staged as a synonym for --cached.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-diff.txt | 1 | ||||
| -rw-r--r-- | builtin-diff.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index c53eba557..a2f192fb7 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 9c8c29573..82d4ddabd 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); @@ -319,7 +319,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)"); |