mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-06 09:13:01 +01:00
Code Activity

Merge branch 'jc/diff--cached'

Browse source 
* jc/diff--cached:
  Revert "git-diff: Introduce --index and deprecate --cached."
This commit is contained in:
Junio C Hamano 2006-12-13 23:55:42 -08:00
commit 67bed724f2
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/git-diff.txt
View file

@ -22,10 +22,8 @@ the number of trees given to the command.
* When one <tree-ish> is given, the working tree and the named * When one <tree-ish> is given, the working tree and the named
tree are compared, using `git-diff-index`. The option tree are compared, using `git-diff-index`. The option
`--index` can be given to compare the index file and `--cached` can be given to compare the index file and
the named tree. 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 * When two <tree-ish>s are given, these two trees are compared
using `git-diff-tree`. using `git-diff-tree`.
@ -49,7 +47,7 @@ Various ways to check your working tree::
+ +
------------ ------------
$ git diff <1> $ git diff <1>
$ git diff --index <2> $ git diff --cached <2>
$ git diff HEAD <3> $ git diff HEAD <3>
------------ ------------
+ +

2
builtin-diff.c
View file

@ -137,7 +137,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, "--index") || !strcmp(arg, "--cached")) if (!strcmp(arg, "--cached"))
cached = 1; cached = 1;
else else
usage(builtin_diff_usage); usage(builtin_diff_usage);