From: Denton Liu Date: Tue, 23 Jun 2020 09:19:49 +0000 (-0400) Subject: builtin/diff: fix botched update of usage comment X-Git-Tag: v2.28.0-rc0~33^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c592fd4c83021b4f098012b3307298fff923c6e7;p=thirdparty%2Fgit.git builtin/diff: fix botched update of usage comment In the previous commit, an attempt was made to correct the "N=1, M=0" case. However, the fix was botched and it introduced two half-correct sections by mistake. Combine these half-correct sections into one fully correct section. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- diff --git a/builtin/diff.c b/builtin/diff.c index bdae4d6a58..cdfb58d04b 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -284,11 +284,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix) * N=1, M=0: * tree vs files (diff-index) * - * N=1, M=0: - * tree vs cache (diff-index --cached) - * * N=1, M=0, --cached: - * tree vs files (diff-index) + * tree vs cache (diff-index --cached) * * N=2, M=0: * tree vs tree (diff-tree)