aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-13 23:55:42 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-13 23:55:42 -0800
commit67bed724f2736925f84edd0aaaf371fea83dddc2 (patch)
treedaf4ea3b01d11cea1122447226a37230152a9434 /Documentation
parent62e1aeabc095a02fd3fb7ef46a6884d76da5ce67 (diff)
parentf2dd1c9adfe961ea611545b018bc67e5d83ee3db (diff)
downloadgit-67bed724f2736925f84edd0aaaf371fea83dddc2.tar.gz
git-67bed724f2736925f84edd0aaaf371fea83dddc2.tar.xz
Merge branch 'jc/diff--cached'
* jc/diff--cached: Revert "git-diff: Introduce --index and deprecate --cached."
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-diff.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 3144864d8..228c4d95b 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>
------------
+