git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Philippe Blain <levraiphilippeblain@gmail.com>,
	Philippe Blain <levraiphilippeblain@gmail.com>
Subject: [PATCH 1/3] diff-format.txt: fix ancient copy-paste error
Date: Mon, 13 Jun 2022 12:29:41 +0000	[thread overview]
Message-ID: <6eaf9b3829fa8f7300bc0123c916d5ffa7c7d80b.1655123383.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1259.git.1655123383.gitgitgadget@gmail.com>

From: Philippe Blain <levraiphilippeblain@gmail.com>

Fix what is probably a copy-paste error dating back all the way to
b6d8f309d9 ([PATCH] diff-raw format update take #2., 2005-05-23).

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
---
 Documentation/diff-format.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 7a9c3b6ff4c..b8319eeb41d 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -43,7 +43,7 @@ That is, from the left to the right:
 . a space.
 . sha1 for "src"; 0\{40\} if creation or unmerged.
 . a space.
-. sha1 for "dst"; 0\{40\} if creation, unmerged or "look at work tree".
+. sha1 for "dst"; 0\{40\} if deletion, unmerged or "look at work tree".
 . a space.
 . status, followed by optional "score" number.
 . a tab or a NUL when `-z` option is used.
-- 
gitgitgadget


  reply	other threads:[~2022-06-13 17:18 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-13 12:29 [PATCH 0/3] Fix a few documentation errors around the raw diff output Philippe Blain via GitGitGadget
2022-06-13 12:29 ` Philippe Blain via GitGitGadget [this message]
2022-06-13 18:23   ` [PATCH 1/3] diff-format.txt: fix ancient copy-paste error Junio C Hamano
2022-06-13 18:26   ` Junio C Hamano
2022-06-14 12:20     ` Philippe Blain
2022-06-13 12:29 ` [PATCH 2/3] diff-format.txt: correct misleading wording Philippe Blain via GitGitGadget
2022-06-13 18:56   ` Junio C Hamano
2022-06-14 12:31     ` Philippe Blain
2022-06-13 12:29 ` [PATCH 3/3] diff-index.txt: update raw output format in examples Philippe Blain via GitGitGadget
2022-06-13 18:59   ` Junio C Hamano
2022-06-13 18:15 ` [PATCH 0/3] Fix a few documentation errors around the raw diff output Junio C Hamano

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

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

  git send-email \
    --in-reply-to=6eaf9b3829fa8f7300bc0123c916d5ffa7c7d80b.1655123383.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=levraiphilippeblain@gmail.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. 
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).