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@xxxxxx> + Helped-by: Denton Liu <liu.denton@xxxxxxxxx> + Helped-by: Junio C Hamano <gitster@xxxxxxxxx> Signed-off-by: ryenus <ryenus@xxxxxxxxx> - 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
