From 571fb9657318b710825cde19b70f7da4392abd44 Mon Sep 17 00:00:00 2001 From: ryenus Date: Sun, 15 Dec 2019 15:12:24 +0000 Subject: fix-typo: consecutive-word duplications Correct unintentional duplication(s) of words, such as "the the", and "can can" etc. 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 Helped-by: Denton Liu Helped-by: Junio C Hamano Signed-off-by: ryenus Signed-off-by: Junio C Hamano diff --git a/Documentation/RelNotes/2.7.3.txt b/Documentation/RelNotes/2.7.3.txt index 6adf038..f618d71 100644 --- a/Documentation/RelNotes/2.7.3.txt +++ b/Documentation/RelNotes/2.7.3.txt @@ -20,7 +20,7 @@ Fixes since v2.7.2 tests. * "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a - rev, i.e. the object named by the the pathname with wildcard + rev, i.e. the object named by the pathname with wildcard characters in a tree object. * "git rev-parse --git-common-dir" used in the worktree feature diff --git a/Makefile b/Makefile index b7d7374..42a061d 100644 --- a/Makefile +++ b/Makefile @@ -481,7 +481,7 @@ all:: # # When DEVELOPER is set, DEVOPTS can be used to control compiler # options. This variable contains keywords separated by -# whitespace. The following keywords are are recognized: +# whitespace. The following keywords are recognized: # # no-error: # diff --git a/graph.c b/graph.c index e3fd0ea..5da111f 100644 --- a/graph.c +++ b/graph.c @@ -218,7 +218,7 @@ struct git_graph { int merge_layout; /* * The number of columns added to the graph by the current commit. For - * 2-way and octopus merges, this is is usually one less than the + * 2-way and octopus merges, this is usually one less than the * number of parents: * * | | | | | \ diff --git a/submodule-config.c b/submodule-config.c index b93482d..8506481 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -626,7 +626,7 @@ static void submodule_cache_check_init(struct repository *repo) /* * Note: This function is private for a reason, the '.gitmodules' file should - * not be used as as a mechanism to retrieve arbitrary configuration stored in + * not be used as a mechanism to retrieve arbitrary configuration stored in * the repository. * * Runs the provided config function on the '.gitmodules' file found in the diff --git a/t/t5314-pack-cycle-detection.sh b/t/t5314-pack-cycle-detection.sh index e525466..0aec861 100755 --- a/t/t5314-pack-cycle-detection.sh +++ b/t/t5314-pack-cycle-detection.sh @@ -53,7 +53,7 @@ immediately after the lookup for "dummy". -# Create a pack containing the the tree $1 and blob $1:file, with +# Create a pack containing the tree $1 and blob $1:file, with # the latter stored as a delta against $2:file. # # We convince pack-objects to make the delta in the direction of our choosing -- cgit v0.10.2-6-g49f6