Skip to content

Commit 24966cd

Browse files
mark-rushakoffgitster
authored andcommitted
doc: fix repeated words
Inspired by 21416f0 ("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 <[email protected]> Acked-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2e27de9 commit 24966cd

9 files changed

+9
-9
lines changed

Documentation/config/color.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ color.blame.highlightRecent::
1414
+
1515
This setting should be set to a comma-separated list of color and date settings,
1616
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
1818
before the given timestamp, overwriting older timestamped colors.
1919
+
2020
Instead of an absolute timestamp relative timestamps work as well, e.g.

Documentation/config/stash.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ stash.useBuiltin::
44
the built-in rewrite of it in C.
55
+
66
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
88
legacy version in case any bugs are found in the rewrite. This option and
99
the shell script version of linkgit:git-stash[1] will be removed in some
1010
future release.

Documentation/git-fast-export.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ marks the same across runs.
116116
and will make master{tilde}4 no longer have master{tilde}5 as
117117
a parent (though both the old master{tilde}4 and new
118118
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
120120
refer to commits in the excluded range of history by their
121121
sha1sum. Note that the resulting stream can only be used by a
122122
repository which already contains the necessary parent

Documentation/git-fast-import.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ the same commit, as `filedeleteall` wipes the branch clean (see below).
425425

426426
The `LF` after the command is optional (it used to be required). Note
427427
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`,
429429
`filedelete`, `filecopy`, `filerename`, `filedeleteall` or
430430
`notemodify` commands) then two `LF` commands may appear at the end of
431431
the command instead of just one.

Documentation/git-pack-objects.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ depth is 4095.
131131
--keep-pack=<pack-name>::
132132
This flag causes an object already in the given pack to be
133133
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
135135
leading directory (e.g. `pack-123.pack`). The option could be
136136
specified multiple times to keep multiple packs.
137137

Documentation/git-push.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ without any `<refspec>` on the command line. Otherwise, missing
7575
+
7676
If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will
7777
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>
7979
is ambiguous.
8080
+
8181
--

Documentation/git-repack.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ depth is 4095.
142142

143143
--keep-pack=<pack-name>::
144144
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
146146
pack file name without leading directory (e.g. `pack-123.pack`).
147147
The option could be specified multiple times to keep multiple
148148
packs.

Documentation/technical/hash-function-transition.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ packfile marked as UNREACHABLE_GARBAGE (using the PSRC field; see
456456
below). To avoid the race when writing new objects referring to an
457457
about-to-be-deleted object, code paths that write new objects will
458458
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).
460460
UNREACHABLE_GARBAGE are then safe to delete if their creation time (as
461461
indicated by the file's mtime) is long enough ago.
462462

Documentation/technical/protocol-v2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Capabilities
141141
------------
142142

143143
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
145145
request, and commands, which are the core actions that a client wants to
146146
perform (fetch, push, etc).
147147

0 commit comments

Comments
 (0)