* [PATCH] builtin/diff: fix botched update of usage comment
@ 2020-06-23 9:19 Denton Liu
0 siblings, 0 replies; only message in thread
From: Denton Liu @ 2020-06-23 9:19 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano
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>
---
Notes:
This patch is based on dl/diff-usage-comment-update.
builtin/diff.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
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)
--
2.27.0.132.g321788e831
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-06-23 9:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-23 9:19 [PATCH] builtin/diff: fix botched update of usage comment Denton Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).