diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-13 01:33:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-13 02:03:11 -0800 |
| commit | f2dd1c9adfe961ea611545b018bc67e5d83ee3db (patch) | |
| tree | aef6570d53bd8d49aeda4a2f313cfa705d7a1ca8 /Documentation/git-diff.txt | |
| parent | 1349f8771310987dd07b679a512e46e1b17e2b8d (diff) | |
| download | git-f2dd1c9adfe961ea611545b018bc67e5d83ee3db.tar.gz git-f2dd1c9adfe961ea611545b018bc67e5d83ee3db.tar.xz | |
Revert "git-diff: Introduce --index and deprecate --cached."
This reverts commit 4c81c213a479e4aae0653a56ad6e8db5c31f019c.
Although --cached and --index are confusing wording, the use of
word --cached for git-diff is consistent with git-apply. It means
"work with index without looking at the working tree".
We should probably come up with better wording for --cached, if
somebody wants to deprecate it. But making --index and --cached
synonyms for diff while leaving them mean different things for
apply is no good.
Diffstat (limited to 'Documentation/git-diff.txt')
| -rw-r--r-- | Documentation/git-diff.txt | 6 |
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> ------------ + |