summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2020-06-23 09:19:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-06-23 23:39:41 (GMT)
commitc592fd4c83021b4f098012b3307298fff923c6e7 (patch)
treeba116caca3b023c89f4a1aef5f7701ac6a3d4304 /builtin/diff.c
parenta9d7689cd405883849fc5bc5427812654d59394f (diff)
downloadgit-c592fd4c83021b4f098012b3307298fff923c6e7.zip
git-c592fd4c83021b4f098012b3307298fff923c6e7.tar.gz
git-c592fd4c83021b4f098012b3307298fff923c6e7.tar.bz2
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 <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
-rw-r--r--builtin/diff.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index bdae4d6..cdfb58d 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)