summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorAndrei Rybak <rybak.a.v@gmail.com>2023-01-07 13:56:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2023-01-08 01:28:34 (GMT)
commitb39a84185e79cff69f9f1f79f1edb014ef27b9c6 (patch)
treee8fd14a9b2cbc2903f479219022931fc44a7179a /builtin/checkout.c
parent4dbebc36b0893f5094668ddea077d0e235560b16 (diff)
downloadgit-b39a84185e79cff69f9f1f79f1edb014ef27b9c6.zip
git-b39a84185e79cff69f9f1f79f1edb014ef27b9c6.tar.gz
git-b39a84185e79cff69f9f1f79f1edb014ef27b9c6.tar.bz2
*: fix typos which duplicate a word
Fix typos in code comments which repeat various words. Most of the cases are simple in that they repeat a word that usually cannot be repeated in a grammatically correct sentence. Just remove the incorrectly duplicated word in these cases and rewrap text, if needed. A tricky case is usage of "that that", which is sometimes grammatically correct. However, an instance of this in "t7527-builtin-fsmonitor.sh" doesn't need two words "that", because there is only one daemon being discussed, so replace the second "that" with "the". Reword code comment "entries exist on on-disk index" in function update_one in file cache-tree.c, by replacing incorrect preposition "on" with "in". Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index cd04f0b..5963e1b 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1270,7 +1270,7 @@ static int parse_branchname_arg(int argc, const char **argv,
* between A and B, A...B names that merge base.
*
* (b) If <something> is _not_ a commit, either "--" is present
- * or <something> is not a path, no -t or -b was given, and
+ * or <something> is not a path, no -t or -b was given,
* and there is a tracking branch whose name is <something>
* in one and only one remote (or if the branch exists on the
* remote named in checkout.defaultRemote), then this is a