aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-13 01:33:43 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-13 02:03:11 -0800
commitf2dd1c9adfe961ea611545b018bc67e5d83ee3db (patch)
treeaef6570d53bd8d49aeda4a2f313cfa705d7a1ca8
parent1349f8771310987dd07b679a512e46e1b17e2b8d (diff)
downloadgit-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.
-rw-r--r--Documentation/git-diff.txt6
-rw-r--r--builtin-diff.c2
2 files changed, 3 insertions, 5 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>
------------
+
diff --git a/builtin-diff.c b/builtin-diff.c
index 1c535b1dd..a6590205e 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);