doc: fix repeated words
Inspired by 21416f0a07 ("restore: fix typo in docs", 2019-08-03), I ran "git grep -E '(\b[a-zA-Z]+) \1\b' -- Documentation/" to find other cases where words were duplicated, e.g. "the the", and in most cases removed one of the repeated words. There were many false positives by this grep command, including deliberate repeated words like "really really" or valid uses of "that that" which I left alone, of course. I also did not correct any of the legitimate, accidentally repeated words in old RelNotes. Signed-off-by: Mark Rushakoff <mark.rushakoff@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mark Rushakoff committed
Aug 9, 2019 at 22:59 UTC
24966cd9820a6b0d4e348807b07cb9af8ba84fc7
9 files changed
+9
-9
Documentation/config/color.txt
+1
-1
@@ -14,7 +14,7 @@ color.blame.highlightRecent::
14
+
15
This setting should be set to a comma-separated list of color and date settings,
16
starting and ending with a color, the dates should be set from oldest to newest.
17
-The metadata will be colored given the colors if the the line was introduced
17
+The metadata will be colored given the colors if the line was introduced
18
before the given timestamp, overwriting older timestamped colors.
19
+
20
Instead of an absolute timestamp relative timestamps work as well, e.g.
Documentation/config/stash.txt
+1
-1
@@ -4,7 +4,7 @@ stash.useBuiltin::
4
the built-in rewrite of it in C.
5
+
6
The C rewrite is first included with Git version 2.22 (and Git for Windows
7
-version 2.19). This option serves an an escape hatch to re-enable the
7
+version 2.19). This option serves as an escape hatch to re-enable the
8
legacy version in case any bugs are found in the rewrite. This option and
9
the shell script version of linkgit:git-stash[1] will be removed in some
10
future release.
Documentation/git-fast-export.txt
+1
-1
@@ -116,7 +116,7 @@ marks the same across runs.
116
and will make master{tilde}4 no longer have master{tilde}5 as
117
a parent (though both the old master{tilde}4 and new
118
master{tilde}4 will have all the same files). Use
119
- --reference-excluded-parents to instead have the the stream
119
+ --reference-excluded-parents to instead have the stream
120
refer to commits in the excluded range of history by their
121
sha1sum. Note that the resulting stream can only be used by a
122
repository which already contains the necessary parent
Documentation/git-fast-import.txt
+1
-1
@@ -425,7 +425,7 @@ the same commit, as `filedeleteall` wipes the branch clean (see below).
425
426
The `LF` after the command is optional (it used to be required). Note
427
that for reasons of backward compatibility, if the commit ends with a
428
-`data` command (i.e. it has has no `from`, `merge`, `filemodify`,
428
+`data` command (i.e. it has no `from`, `merge`, `filemodify`,
429
`filedelete`, `filecopy`, `filerename`, `filedeleteall` or
430
`notemodify` commands) then two `LF` commands may appear at the end of
431
the command instead of just one.
Documentation/git-pack-objects.txt
+1
-1
@@ -131,7 +131,7 @@ depth is 4095.
131
--keep-pack=<pack-name>::
132
This flag causes an object already in the given pack to be
133
ignored, even if it would have otherwise been
134
- packed. `<pack-name>` is the the pack file name without
134
+ packed. `<pack-name>` is the pack file name without
135
leading directory (e.g. `pack-123.pack`). The option could be
136
specified multiple times to keep multiple packs.
137
Documentation/git-push.txt
+1
-1
@@ -75,7 +75,7 @@ without any `<refspec>` on the command line. Otherwise, missing
75
+
76
If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will
77
try to infer where in `refs/*` on the destination <repository> it
78
-belongs based on the the type of <src> being pushed and whether <dst>
78
+belongs based on the type of <src> being pushed and whether <dst>
79
is ambiguous.
80
+
81
--
Documentation/git-repack.txt
+1
-1
@@ -142,7 +142,7 @@ depth is 4095.
142
143
--keep-pack=<pack-name>::
144
Exclude the given pack from repacking. This is the equivalent
145
- of having `.keep` file on the pack. `<pack-name>` is the the
145
+ of having `.keep` file on the pack. `<pack-name>` is the
146
pack file name without leading directory (e.g. `pack-123.pack`).
147
The option could be specified multiple times to keep multiple
148
packs.
Documentation/technical/hash-function-transition.txt
+1
-1
@@ -456,7 +456,7 @@ packfile marked as UNREACHABLE_GARBAGE (using the PSRC field; see
456
below). To avoid the race when writing new objects referring to an
457
about-to-be-deleted object, code paths that write new objects will
458
need to copy any objects from UNREACHABLE_GARBAGE packs that they
459
-refer to to new, non-UNREACHABLE_GARBAGE packs (or loose objects).
459
+refer to new, non-UNREACHABLE_GARBAGE packs (or loose objects).
460
UNREACHABLE_GARBAGE are then safe to delete if their creation time (as
461
indicated by the file's mtime) is long enough ago.
462
Documentation/technical/protocol-v2.txt
+1
-1
@@ -141,7 +141,7 @@ Capabilities
141
------------
142
143
There are two different types of capabilities: normal capabilities,
144
-which can be used to to convey information or alter the behavior of a
144
+which can be used to convey information or alter the behavior of a
145
request, and commands, which are the core actions that a client wants to
146
perform (fetch, push, etc).
147