undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-diff: Add --staged as a synonym for --cached.

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Symonds 2008-10-29 09:15:36 -07:00 committed by Junio C Hamano
parent 36bd844658
commit 2baf1850ce
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/git-diff.txt
View File

@ -33,6 +33,7 @@ forced by --no-index.
commit relative to the named <commit>. Typically you commit relative to the named <commit>. Typically you
would want comparison with the latest commit, so if you would want comparison with the latest commit, so if you
do not give <commit>, it defaults to HEAD. do not give <commit>, it defaults to HEAD.
--staged is a synonym of --cached.
'git diff' [--options] <commit> [--] [<path>...]:: 'git diff' [--options] <commit> [--] [<path>...]::

5
builtin-diff.c
View File

@ -118,7 +118,7 @@ static int builtin_diff_index(struct rev_info *revs,
int cached = 0; int cached = 0;
while (1 < argc) { while (1 < argc) {
const char *arg = argv[1]; const char *arg = argv[1];
if (!strcmp(arg, "--cached")) if (!strcmp(arg, "--cached") || !strcmp(arg, "--staged"))
cached = 1; cached = 1;
else else
usage(builtin_diff_usage); usage(builtin_diff_usage);
@ -319,7 +319,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
const char *arg = argv[i]; const char *arg = argv[i];
if (!strcmp(arg, "--")) if (!strcmp(arg, "--"))
break; break;
else if (!strcmp(arg, "--cached")) { else if (!strcmp(arg, "--cached") ||
!strcmp(arg, "--staged")) {
add_head_to_pending(&rev); add_head_to_pending(&rev);
if (!rev.pending.nr) if (!rev.pending.nr)
die("No HEAD commit to compare with (yet)"); die("No HEAD commit to compare with (yet)");