Skip to content

Commit

Permalink
git-diff: Introduce --index and deprecate --cached.
Browse files Browse the repository at this point in the history
'git diff --cached' still works, but its use is discouraged
in the documentation. 'git diff --index' does the same thing
and is consistent with how 'git apply --index' works.

Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Andreas Ericsson authored and Junio C Hamano committed Dec 2, 2006
1 parent ced7b82 commit 4c81c21
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions Documentation/git-diff.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ the number of trees given to the command.

* When one <tree-ish> is given, the working tree and the named
tree are compared, using `git-diff-index`. The option
`--cached` can be given to compare the index file and
`--index` can be given to compare the index file and
the named tree.
`--cached` is a deprecated alias for `--index`. It's use is
discouraged.

* When two <tree-ish>s are given, these two trees are compared
using `git-diff-tree`.
Expand All @@ -47,7 +49,7 @@ Various ways to check your working tree::
+
------------
$ git diff <1>
$ git diff --cached <2>
$ git diff --index <2>
$ git diff HEAD <3>
------------
+
Expand Down
2 changes: 1 addition & 1 deletion builtin-diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,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, "--index") || !strcmp(arg, "--cached"))
cached = 1;
else
usage(builtin_diff_usage);
Expand Down

0 comments on commit 4c81c21

Please sign in to comment.