Skip to content

Commit 22e5e58

Browse files
Ralf Wildenhuesgitster
authored andcommitted
Typos in code comments, an error message, documentation
Signed-off-by: Ralf Wildenhues <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0eb032d commit 22e5e58

17 files changed

+26
-26
lines changed

Documentation/RelNotes-1.5.6.3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ GIT v1.5.6.3 Release Notes
44
Fixes since v1.5.6.2
55
--------------------
66

7-
* Setting core.sharerepository to traditional "true" value was supposed to make
7+
* Setting core.sharedrepository to traditional "true" value was supposed to make
88
the repository group writable but should not affect permission for others.
99
However, since 1.5.6, it was broken to drop permission for others when umask is
1010
022, making the repository unreadable by others.

Documentation/RelNotes-1.6.0.2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Fixes since v1.6.0.1
1717
* Many commands did not use the correct working tree location when used
1818
with GIT_WORK_TREE environment settings.
1919

20-
* Some systems needs to use compatibility fnmach and regex libraries
20+
* Some systems need to use compatibility fnmatch and regex libraries
2121
independent from each other; the compat/ area has been reorganized to
2222
allow this.
2323

Documentation/RelNotes-1.6.4.3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Fixes since v1.6.4.2
1111
been deprecated.
1212

1313
* "git fetch" and "git clone" had an extra sanity check to verify the
14-
presense of the corresponding *.pack file before downloading *.idx
14+
presence of the corresponding *.pack file before downloading *.idx
1515
file by issuing a HEAD request. Github server however sometimes
1616
gave 500 (Internal server error) response to HEAD even if a GET
1717
request for *.pack file to the same URL would have succeeded, and broke

Documentation/RelNotes-1.6.5.4.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Fixes since v1.6.5.3
2626
future versions, but not in this release,
2727

2828
* "git merge -m <message> <branch>..." added the standard merge message
29-
on its own after user-supplied message, which should have overrided the
29+
on its own after user-supplied message, which should have overridden the
3030
standard one.
3131

3232
Other minor documentation updates are included.

Documentation/RelNotes-1.6.5.7.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Fixes since v1.6.5.6
1010
an older version of git should just ignore them. Instead we diagnosed
1111
it as an error.
1212

13-
* With help.autocorrect set to non-zero value, the logic to guess typoes
13+
* With help.autocorrect set to non-zero value, the logic to guess typos
1414
in the subcommand name misfired and ran a random nonsense command.
1515

1616
* If a command is run with an absolute path as a pathspec inside a bare

Documentation/RelNotes-1.6.6.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ or adjust to the new behaviour, on the day their sysadmin decides to install
2929
the new version of git. When we switched from "git-foo" to "git foo" in
3030
1.6.0, even though the change had been advertised and the transition
3131
guide had been provided for a very long time, the users procrastinated
32-
during the entire transtion period, and ended up panicking on the day
32+
during the entire transition period, and ended up panicking on the day
3333
their sysadmins updated their git installation. We are trying to avoid
3434
repeating that unpleasantness in the 1.7.0 release.
3535

@@ -94,7 +94,7 @@ users will fare this time.
9494
* "git diff" traditionally treated various "ignore whitespace" options
9595
only as a way to filter the patch output. "git diff --exit-code -b"
9696
exited with non-zero status even if all changes were about changing the
97-
ammount of whitespace and nothing else. and "git diff -b" showed the
97+
amount of whitespace and nothing else. and "git diff -b" showed the
9898
"diff --git" header line for such a change without patch text.
9999

100100
In 1.7.0, the "ignore whitespaces" will affect the semantics of the

Documentation/RelNotes-1.7.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ release, unless otherwise noted.
202202
the branch is fully merged to its upstream branch if it is not merged
203203
to the current branch. It now deletes it in such a case.
204204

205-
* "fiter-branch" command incorrectly said --prune-empty and --filter-commit
205+
* "filter-branch" command incorrectly said --prune-empty and --filter-commit
206206
were incompatible; the latter should be read as --commit-filter.
207207

208208
* When using "git status" or asking "git diff" to compare the work tree

Documentation/howto/revert-a-faulty-merge.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ reverting W. Mainline's history would look like this:
229229
A---B---C
230230

231231
But if you don't actually need to change commit A, then you need some way to
232-
recreate it as a new commit with the same changes in it. The rebase commmand's
232+
recreate it as a new commit with the same changes in it. The rebase command's
233233
--no-ff option provides a way to do this:
234234

235235
$ git rebase [-i] --no-ff P

builtin/blame.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2376,11 +2376,11 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
23762376
*
23772377
* The remaining are:
23782378
*
2379-
* (1) if dashdash_pos != 0, its either
2379+
* (1) if dashdash_pos != 0, it is either
23802380
* "blame [revisions] -- <path>" or
23812381
* "blame -- <path> <rev>"
23822382
*
2383-
* (2) otherwise, its one of the two:
2383+
* (2) otherwise, it is one of the two:
23842384
* "blame [revisions] <path>"
23852385
* "blame <path> <rev>"
23862386
*

compat/mingw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ static char *lookup_prog(const char *dir, const char *cmd, int isexe, int exe_on
641641
}
642642

643643
/*
644-
* Determines the absolute path of cmd using the the split path in path.
644+
* Determines the absolute path of cmd using the split path in path.
645645
* If cmd contains a slash or backslash, no lookup is performed.
646646
*/
647647
static char *path_lookup(const char *cmd, char **path, int exe_only)

0 commit comments

Comments
 (0)