From: "ryenus via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/1] fix-typo: consecutive-word duplications
Date: Sun, 15 Dec 2019 15:12:23 +0000 [thread overview]
Message-ID: <pull.482.v2.git.1576422744.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.482.git.1575517503.gitgitgadget@gmail.com>
This fixes unintentional duplication(s) of words, such as the the, and can
can etc. I also take the chance to make a few wording tweaks to avoid
suspicious duplication(s).
ryenus (1):
fix-typo: consecutive-word duplications
Documentation/RelNotes/2.7.3.txt | 2 +-
Makefile | 2 +-
graph.c | 2 +-
submodule-config.c | 2 +-
t/t5314-pack-cycle-detection.sh | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
base-commit: ad05a3d8e5a6a06443836b5e40434262d992889a
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-482%2Fryenus%2Ffix-typo-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-482/ryenus/fix-typo-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/482
Range-diff vs v1:
1: abb9e55ad5 ! 1: 3180741259 fix-typo: consecutive-word duplications
@@ -5,26 +5,14 @@
Correct unintentional duplication(s) of words, such as "the the",
and "can can" etc.
- In certain cases, the repeated words are suspicious but actually ok,
- and if some alternative wording exists and might be an improvement,
- then the alternative wording is used, for example:
- "we didn't do so so far" becomes "we didn't do that so far".
+ The changes are only applied to cases where it's fixing what is clearly
+ wrong or prone to misunderstanding, as suggested by the reviewers.
+ Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
+ Helped-by: Denton Liu <liu.denton@gmail.com>
+ Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: ryenus <ryenus@gmail.com>
- diff --git a/Documentation/RelNotes/2.13.0.txt b/Documentation/RelNotes/2.13.0.txt
- --- a/Documentation/RelNotes/2.13.0.txt
- +++ b/Documentation/RelNotes/2.13.0.txt
-@@
-
- * Deletion of a branch "foo/bar" could remove .git/refs/heads/foo
- once there no longer is any other branch whose name begins with
-- "foo/", but we didn't do so so far. Now we do.
-+ "foo/", but we didn't do that so far. Now we do.
-
- * When "git merge" detects a path that is renamed in one history
- while the other history deleted (or modified) it, it now reports
-
diff --git a/Documentation/RelNotes/2.7.3.txt b/Documentation/RelNotes/2.7.3.txt
--- a/Documentation/RelNotes/2.7.3.txt
+++ b/Documentation/RelNotes/2.7.3.txt
@@ -51,19 +39,6 @@
# no-error:
#
- diff --git a/convert.c b/convert.c
- --- a/convert.c
- +++ b/convert.c
-@@
- *
- * This should use the pathname to decide on whether it wants to do some
- * more interesting conversions (automatic gzip/unzip, general format
-- * conversions etc etc), but by default it just does automatic CRLF<->LF
-+ * conversions etc), but by default it just does automatic CRLF<->LF
- * translation when the "text" attribute or "auto_crlf" option is set.
- */
-
-
diff --git a/graph.c b/graph.c
--- a/graph.c
+++ b/graph.c
--
gitgitgadget
next prev parent reply other threads:[~2019-12-15 15:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-05 3:45 [PATCH 0/1] fix-typo: consecutive-word duplications ryenus via GitGitGadget
2019-12-05 3:45 ` [PATCH 1/1] " ryenus via GitGitGadget
2019-12-05 14:13 ` Junio C Hamano
2019-12-15 15:12 ` ryenus via GitGitGadget [this message]
2019-12-15 15:12 ` [PATCH v2 " ryenus via GitGitGadget
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=pull.482.v2.git.1576422744.gitgitgadget@gmail.com \
--to=gitgitgadget@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.