git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] builtin/diff: fix botched update of usage comment
Date: Tue, 23 Jun 2020 05:19:49 -0400	[thread overview]
Message-ID: <4a1e357c390690375374490cd5aa2431a2593b9d.1592903964.git.liu.denton@gmail.com> (raw)

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


                 reply	other threads:[~2020-06-23  9:20 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4a1e357c390690375374490cd5aa2431a2593b9d.1592903964.git.liu.denton@gmail.com \
    --to=liu.denton@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).