diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-13 23:55:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-13 23:55:42 -0800 |
| commit | 67bed724f2736925f84edd0aaaf371fea83dddc2 (patch) | |
| tree | daf4ea3b01d11cea1122447226a37230152a9434 | |
| parent | git-svn: allow both diff.color and color.diff (diff) | |
| parent | Revert "git-diff: Introduce --index and deprecate --cached." (diff) | |
| download | tgif-67bed724f2736925f84edd0aaaf371fea83dddc2.tar.xz | |
Merge branch 'jc/diff--cached'
* jc/diff--cached:
Revert "git-diff: Introduce --index and deprecate --cached."
| -rw-r--r-- | Documentation/git-diff.txt | 6 | ||||
| -rw-r--r-- | builtin-diff.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 3144864d85..228c4d95bd 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -22,10 +22,8 @@ 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 - `--index` can be given to compare the index file and + `--cached` 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`. @@ -49,7 +47,7 @@ Various ways to check your working tree:: + ------------ $ git diff <1> -$ git diff --index <2> +$ git diff --cached <2> $ git diff HEAD <3> ------------ + diff --git a/builtin-diff.c b/builtin-diff.c index 1c535b1dd6..a6590205e8 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -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, "--index") || !strcmp(arg, "--cached")) + if (!strcmp(arg, "--cached")) cached = 1; else usage(builtin_diff_usage); |