{"thread":{"id":"51616","subject":"[PATCH 0/1] doc: fix repeated words","startedAt":"2019-08-10T05:59:19Z","lastAt":"2019-08-12T00:41:58Z","messageCount":4,"participants":["Mark Rushakoff via GitGitGadget","Jeff King","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"380255","messageId":"pull.309.git.gitgitgadget@gmail.com","threadId":"51616","inReplyTo":null,"subject":"[PATCH 0/1] doc: fix repeated words","fromName":"Mark Rushakoff via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-08-10T05:59:13Z","receivedAt":"2019-08-10T05:59:19Z","isPatch":true,"sender":{"key":"mark@influxdata.com","avatar":null},"body":"Inspired by 21416f0a07 (\"restore: fix typo in docs\", 2019-08-03), I ran \"git\ngrep -E '(\\b[a-zA-Z]+) \\1\\b' -- Documentation/\" to find other cases where\nwords were duplicated, e.g. \"the the\", and in most cases removed one of the\nrepeated words.\n\nMark Rushakoff (1):\n doc: fix repeated words\n\n Documentation/config/color.txt | 2 +-\n Documentation/config/stash.txt | 2 +-\n Documentation/git-fast-export.txt | 2 +-\n Documentation/git-fast-import.txt | 2 +-\n Documentation/git-pack-objects.txt | 2 +-\n Documentation/git-push.txt | 2 +-\n Documentation/git-repack.txt | 2 +-\n Documentation/technical/hash-function-transition.txt | 2 +-\n Documentation/technical/protocol-v2.txt | 2 +-\n 9 files changed, 9 insertions(+), 9 deletions(-)\n\n\nbase-commit: 2e27de94d485a6da0c8e264c165e55100f1a13a8\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-309%2Fmark-rushakoff%2Fdocs%2Ffix-repeated-words-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-309/mark-rushakoff/docs/fix-repeated-words-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/309\n-- \ngitgitgadget\n"},{"id":"380256","messageId":"76831150995dd3e7847825192b22114a6d4906d1.1565416752.git.gitgitgadget@gmail.com","threadId":"51616","inReplyTo":"pull.309.git.gitgitgadget@gmail.com","subject":"[PATCH 1/1] doc: fix repeated words","fromName":"Mark Rushakoff via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-08-10T05:59:14Z","receivedAt":"2019-08-10T05:59:19Z","isPatch":true,"sender":{"key":"mark@influxdata.com","avatar":null},"body":"From: Mark Rushakoff \n\nInspired by 21416f0a07 (\"restore: fix typo in docs\", 2019-08-03), I ran\n\"git grep -E '(\\b[a-zA-Z]+) \\1\\b' -- Documentation/\" to find other cases\nwhere words were duplicated, e.g. \"the the\", and in most cases removed\none of the repeated words.\n\nThere were many false positives by this grep command, including\ndeliberate repeated words like \"really really\" or valid uses of \"that\nthat\" which I left alone, of course.\n\nI also did not correct any of the legitimate, accidentally repeated\nwords in old RelNotes.\n\nSigned-off-by: Mark Rushakoff \n---\n Documentation/config/color.txt | 2 +-\n Documentation/config/stash.txt | 2 +-\n Documentation/git-fast-export.txt | 2 +-\n Documentation/git-fast-import.txt | 2 +-\n Documentation/git-pack-objects.txt | 2 +-\n Documentation/git-push.txt | 2 +-\n Documentation/git-repack.txt | 2 +-\n Documentation/technical/hash-function-transition.txt | 2 +-\n Documentation/technical/protocol-v2.txt | 2 +-\n 9 files changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/config/color.txt b/Documentation/config/color.txt\nindex 8375596c44..d5daacb13a 100644\n--- a/Documentation/config/color.txt\n+++ b/Documentation/config/color.txt\n@@ -14,7 +14,7 @@ color.blame.highlightRecent::\n +\n This setting should be set to a comma-separated list of color and date settings,\n starting and ending with a color, the dates should be set from oldest to newest.\n-The metadata will be colored given the colors if the the line was introduced\n+The metadata will be colored given the colors if the line was introduced\n before the given timestamp, overwriting older timestamped colors.\n +\n Instead of an absolute timestamp relative timestamps work as well, e.g.\ndiff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt\nindex 7710758efb..abc7ef4a3a 100644\n--- a/Documentation/config/stash.txt\n+++ b/Documentation/config/stash.txt\n@@ -4,7 +4,7 @@ stash.useBuiltin::\n the built-in rewrite of it in C.\n +\n The C rewrite is first included with Git version 2.22 (and Git for Windows\n-version 2.19). This option serves an an escape hatch to re-enable the\n+version 2.19). This option serves as an escape hatch to re-enable the\n legacy version in case any bugs are found in the rewrite. This option and\n the shell script version of linkgit:git-stash[1] will be removed in some\n future release.\ndiff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt\nindex 11427acdde..cc940eb9ad 100644\n--- a/Documentation/git-fast-export.txt\n+++ b/Documentation/git-fast-export.txt\n@@ -116,7 +116,7 @@ marks the same across runs.\n \tand will make master{tilde}4 no longer have master{tilde}5 as\n \ta parent (though both the old master{tilde}4 and new\n \tmaster{tilde}4 will have all the same files). Use\n-\t--reference-excluded-parents to instead have the the stream\n+\t--reference-excluded-parents to instead have the stream\n \trefer to commits in the excluded range of history by their\n \tsha1sum. Note that the resulting stream can only be used by a\n \trepository which already contains the necessary parent\ndiff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt\nindex 7baf9e47b5..fad327aecc 100644\n--- a/Documentation/git-fast-import.txt\n+++ b/Documentation/git-fast-import.txt\n@@ -425,7 +425,7 @@ the same commit, as `filedeleteall` wipes the branch clean (see below).\n \n The `LF` after the command is optional (it used to be required). Note\n that for reasons of backward compatibility, if the commit ends with a\n-`data` command (i.e. it has has no `from`, `merge`, `filemodify`,\n+`data` command (i.e. it has no `from`, `merge`, `filemodify`,\n `filedelete`, `filecopy`, `filerename`, `filedeleteall` or\n `notemodify` commands) then two `LF` commands may appear at the end of\n the command instead of just one.\ndiff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt\nindex e45f3e680d..fecdf2600c 100644\n--- a/Documentation/git-pack-objects.txt\n+++ b/Documentation/git-pack-objects.txt\n@@ -131,7 +131,7 @@ depth is 4095.\n --keep-pack=::\n \tThis flag causes an object already in the given pack to be\n \tignored, even if it would have otherwise been\n-\tpacked. `` is the the pack file name without\n+\tpacked. `` is the pack file name without\n \tleading directory (e.g. `pack-123.pack`). The option could be\n \tspecified multiple times to keep multiple packs.\n \ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex 6a8a0d958b..3b8053447e 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -75,7 +75,7 @@ without any `` on the command line. Otherwise, missing\n +\n If doesn't start with `refs/` (e.g. `refs/heads/master`) we will\n try to infer where in `refs/*` on the destination it\n-belongs based on the the type of being pushed and whether \n+belongs based on the type of being pushed and whether \n is ambiguous.\n +\n --\ndiff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt\nindex aa0cc8bd44..92f146d27d 100644\n--- a/Documentation/git-repack.txt\n+++ b/Documentation/git-repack.txt\n@@ -142,7 +142,7 @@ depth is 4095.\n \n --keep-pack=::\n \tExclude the given pack from repacking. This is the equivalent\n-\tof having `.keep` file on the pack. `` is the the\n+\tof having `.keep` file on the pack. `` is the\n \tpack file name without leading directory (e.g. `pack-123.pack`).\n \tThe option could be specified multiple times to keep multiple\n \tpacks.\ndiff --git a/Documentation/technical/hash-function-transition.txt b/Documentation/technical/hash-function-transition.txt\nindex bc2ace2a6e..2ae8fa470a 100644\n--- a/Documentation/technical/hash-function-transition.txt\n+++ b/Documentation/technical/hash-function-transition.txt\n@@ -456,7 +456,7 @@ packfile marked as UNREACHABLE_GARBAGE (using the PSRC field; see\n below). To avoid the race when writing new objects referring to an\n about-to-be-deleted object, code paths that write new objects will\n need to copy any objects from UNREACHABLE_GARBAGE packs that they\n-refer to to new, non-UNREACHABLE_GARBAGE packs (or loose objects).\n+refer to new, non-UNREACHABLE_GARBAGE packs (or loose objects).\n UNREACHABLE_GARBAGE are then safe to delete if their creation time (as\n indicated by the file's mtime) is long enough ago.\n \ndiff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt\nindex 03264c7d9a..40f91f6b1e 100644\n--- a/Documentation/technical/protocol-v2.txt\n+++ b/Documentation/technical/protocol-v2.txt\n@@ -141,7 +141,7 @@ Capabilities\n ------------\n \n There are two different types of capabilities: normal capabilities,\n-which can be used to to convey information or alter the behavior of a\n+which can be used to convey information or alter the behavior of a\n request, and commands, which are the core actions that a client wants to\n perform (fetch, push, etc).\n \n-- \ngitgitgadget\n"},{"id":"380257","messageId":"20190810060351.GA25876@sigill.intra.peff.net","threadId":"51616","inReplyTo":"76831150995dd3e7847825192b22114a6d4906d1.1565416752.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/1] doc: fix repeated words","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-08-10T06:03:51Z","receivedAt":"2019-08-10T06:03:53Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Aug 09, 2019 at 10:59:14PM -0700, Mark Rushakoff via GitGitGadget wrote:\n\n> From: Mark Rushakoff \n> \n> Inspired by 21416f0a07 (\"restore: fix typo in docs\", 2019-08-03), I ran\n> \"git grep -E '(\\b[a-zA-Z]+) \\1\\b' -- Documentation/\" to find other cases\n> where words were duplicated, e.g. \"the the\", and in most cases removed\n> one of the repeated words.\n> \n> There were many false positives by this grep command, including\n> deliberate repeated words like \"really really\" or valid uses of \"that\n> that\" which I left alone, of course.\n> \n> I also did not correct any of the legitimate, accidentally repeated\n> words in old RelNotes.\n\nThanks. I read over each of these, and they are all obviously the right\nthing to do.\n\n-Peff\n"},{"id":"380295","messageId":"xmqqsgq7b4hh.fsf@gitster-ct.c.googlers.com","threadId":"51616","inReplyTo":"20190810060351.GA25876@sigill.intra.peff.net","subject":"Re: [PATCH 1/1] doc: fix repeated words","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-08-12T00:40:42Z","receivedAt":"2019-08-12T00:41:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n>> There were many false positives by this grep command, including\n>> deliberate repeated words like \"really really\" or valid uses of \"that\n>> that\" which I left alone, of course.\n>> \n>> I also did not correct any of the legitimate, accidentally repeated\n>> words in old RelNotes.\n>\n> Thanks. I read over each of these, and they are all obviously the right\n> thing to do.\n\nThanks, both.\n"}]}