summaryrefslogtreecommitdiff
path: root/builtin-diff.c
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 /builtin-diff.c
parent1349f8771310987dd07b679a512e46e1b17e2b8d (diff)
downloadgit-f2dd1c9adfe961ea611545b018bc67e5d83ee3db.tar.gz
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 'builtin-diff.c')
-rw-r--r--builtin-diff.c2
1 files changed, 1 insertions, 1 deletions
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);