Merge branch 'jc/diff--cached'

* jc/diff--cached:
  Revert "git-diff: Introduce --index and deprecate --cached."

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>
 ------------
 +

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);