Skip to content

Commit 7b1f01f

Browse files
committed
Merge branch 'ss/duplicate-typos'
Typofixes. * ss/duplicate-typos: global: Fix duplicate word typos
2 parents aabbcf2 + c32d4a8 commit 7b1f01f

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

Documentation/RelNotes/2.45.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ UI, Workflows & Features
99
With "git init --ref-format=reftable", hopefully it would be a lot
1010
more efficient to manage a repository with many references.
1111

12-
* "git checkout -p" and friends learned that that "@" is a synonym
12+
* "git checkout -p" and friends learned that "@" is a synonym
1313
for "HEAD".
1414

1515
* Variants of vimdiff learned to honor mergetool.<variant>.layout

Documentation/RelNotes/2.46.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ UI, Workflows & Features
7878
turn on cover letters automatically (unless told never to enable
7979
cover letter with "--no-cover-letter" and such).
8080

81-
* The "--heads" option of "ls-remote" and "show-ref" has been been
81+
* The "--heads" option of "ls-remote" and "show-ref" has been
8282
deprecated; "--branches" replaces "--heads".
8383

8484
* For over a year, setting add.interactive.useBuiltin configuration

Documentation/git-format-patch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ is not complete yet ("WIP" stands for "Work In Progress").
250250
+
251251
If the convention of the receiving community for a particular extra
252252
string is to have it _after_ the subject prefix, the string _<rfc>_
253-
can be prefixed with a dash ("`-`") to signal that the the rest of
253+
can be prefixed with a dash ("`-`") to signal that the rest of
254254
the _<rfc>_ string should be appended to the subject prefix instead,
255255
e.g., `--rfc='-(WIP)'` results in "PATCH (WIP)".
256256

Documentation/gitprotocol-v2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ This would allow for optimizing the common case of servers who'd like
776776
to provide one "big bundle" containing only their "main" branch,
777777
and/or incremental updates thereof.
778778
+
779-
A client receiving such a a response MAY assume that they can skip
779+
A client receiving such a response MAY assume that they can skip
780780
retrieving the header from a bundle at the indicated URI, and thus
781781
save themselves and the server(s) the request(s) needed to inspect the
782782
headers of that bundle or bundles.

Documentation/howto/keep-canonical-history-correct.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ that appears to be "backwards" from what other project developers
1313
expect. This howto presents a suggested integration workflow for
1414
maintaining a central repository.
1515

16-
Suppose that that central repository has this history:
16+
Suppose that the central repository has this history:
1717

1818
------------
1919
---o---o---A

builtin/difftool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ static void write_file_in_directory(struct strbuf *dir, size_t dir_len,
340340
/* Write the file contents for the left and right sides of the difftool
341341
* dir-diff representation for submodules and symlinks. Symlinks and submodules
342342
* are written as regular text files so that external diff tools can diff them
343-
* as text files, resulting in behavior that is analogous to to what "git diff"
343+
* as text files, resulting in behavior that is analogous to what "git diff"
344344
* displays for symlink and submodule diffs.
345345
*/
346346
static void write_standin_files(struct pair_entry *entry,

ci/lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ trap "end_group 'CI setup'" EXIT
6262
# something went wrong.
6363
#
6464
# We already enabled tracing executed commands earlier. This helps by showing
65-
# how # environment variables are set and and dependencies are installed.
65+
# how # environment variables are set and dependencies are installed.
6666
set -e
6767

6868
skip_branch_tip_with_tag () {

fsmonitor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ static size_t handle_using_name_hash_icase(
247247
* technically this is a tracked file or a sparse-directory.
248248
* It should not have any entries in the untracked-cache, so
249249
* we should not need to use the case-corrected spelling to
250-
* invalidate the the untracked-cache. So we may not need to
250+
* invalidate the untracked-cache. So we may not need to
251251
* do this. For now, I'm going to be conservative and always
252252
* do it; we can revisit this later.
253253
*/

oidtree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void oidtree_insert(struct oidtree *ot, const struct object_id *oid)
4747

4848
/*
4949
* n.b. Current callers won't get us duplicates, here. If a
50-
* future caller causes duplicates, there'll be a a small leak
50+
* future caller causes duplicates, there'll be a small leak
5151
* that won't be freed until oidtree_clear. Currently it's not
5252
* worth maintaining a free list
5353
*/

read-cache-ll.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ struct index_state {
196196
*
197197
* If the variable won't be used again, use release_index() to free()
198198
* its resources. If it needs to be used again use discard_index(),
199-
* which does the same thing, but will use use index_state_init() at
199+
* which does the same thing, but will use index_state_init() at
200200
* the end. The discard_index() will use its own "istate->repo" as the
201201
* "r" argument to index_state_init() in that case.
202202
*/

refs/reftable-backend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2131,7 +2131,7 @@ static int write_reflog_existence_table(struct reftable_writer *writer,
21312131
reftable_writer_set_limits(writer, ts, ts);
21322132

21332133
/*
2134-
* The existence entry has both old and new object ID set to the the
2134+
* The existence entry has both old and new object ID set to the
21352135
* null object ID. Our iterators are aware of this and will not present
21362136
* them to their callers.
21372137
*/

0 commit comments

Comments
 (0)