diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-13 23:55:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-13 23:55:42 -0800 |
| commit | 67bed724f2736925f84edd0aaaf371fea83dddc2 (patch) | |
| tree | daf4ea3b01d11cea1122447226a37230152a9434 /builtin-diff.c | |
| parent | 62e1aeabc095a02fd3fb7ef46a6884d76da5ce67 (diff) | |
| parent | f2dd1c9adfe961ea611545b018bc67e5d83ee3db (diff) | |
| download | git-67bed724f2736925f84edd0aaaf371fea83dddc2.tar.xz | |
Merge branch 'jc/diff--cached'
* jc/diff--cached:
Revert "git-diff: Introduce --index and deprecate --cached."
Diffstat (limited to 'builtin-diff.c')
| -rw-r--r-- | builtin-diff.c | 2 |
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); |