Revert "Allow branch.*.merge to talk about remote tracking branches."

diff --git a/builtin-diff.c b/builtin-diff.c
index 1c535b1dd620ce40814da41bdddb8638cafeceb4..a6590205e8f746304f3d06d3e328a05bf2bf954e 100644 (file)
--- 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);