Skip to content

Commit 17b83d7

Browse files
neleaigitster
authored andcommitted
typofix: documentation
Signed-off-by: Ondřej Bílka <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1114fc0 commit 17b83d7

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

Documentation/git-bisect-lk2009.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,7 @@ So git bisect is unconditional goodness - and feel free to quote that
13201320
;-)
13211321
_____________
13221322

1323-
Acknowledgements
1323+
Acknowledgments
13241324
----------------
13251325

13261326
Many thanks to Junio Hamano for his help in reviewing this paper, for

Documentation/git-rev-parse.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ eval "set -- $(git rev-parse --sq --prefix "$prefix" "$@")"
8383
+
8484
If you want to make sure that the output actually names an object in
8585
your object database and/or can be used as a specific type of object
86-
you require, you can add "^{type}" peeling operator to the parmeter.
86+
you require, you can add "^{type}" peeling operator to the parameter.
8787
For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR`
8888
names an existing object that is a commit-ish (i.e. a commit, or an
8989
annotated tag that points at a commit). To make sure that `$VAR`

Documentation/gitweb.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ repositories, you can configure Apache like this:
504504

505505
The above configuration expects your public repositories to live under
506506
'/pub/git' and will serve them as `http://git.domain.org/dir-under-pub-git`,
507-
both as cloneable Git URL and as browseable gitweb interface. If you then
507+
both as clonable Git URL and as browseable gitweb interface. If you then
508508
start your linkgit:git-daemon[1] with `--base-path=/pub/git --export-all`
509509
then you can even use the `git://` URL with exactly the same path.
510510

Documentation/howto/revert-branch-rebase.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ How to revert an existing commit
1212
================================
1313

1414
One of the changes I pulled into the 'master' branch turns out to
15-
break building Git with GCC 2.95. While they were well intentioned
15+
break building Git with GCC 2.95. While they were well-intentioned
1616
portability fixes, keeping things working with gcc-2.95 was also
1717
important. Here is what I did to revert the change in the 'master'
1818
branch and to adjust the 'pu' branch, using core Git tools and

Documentation/rev-list-options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ each merge. The commits are:
369369
* `E` changes `quux` to "xyzzy", and its merge `P` combines the
370370
strings to "quux xyzzy". `P` is TREESAME to `O`, but not to `E`.
371371

372-
* `X` is an indpendent root commit that added a new file `side`, and `Y`
372+
* `X` is an independent root commit that added a new file `side`, and `Y`
373373
modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
374374
`Q` is TREESAME to `P`, but not to `Y`.
375375

Documentation/technical/index-format.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Git index format
175175

176176
A conflict is represented in the index as a set of higher stage entries.
177177
When a conflict is resolved (e.g. with "git add path"), these higher
178-
stage entries will be removed and a stage-0 entry with proper resoluton
178+
stage entries will be removed and a stage-0 entry with proper resolution
179179
is added.
180180

181181
When these higher stage entries are removed, they are saved in the

Documentation/technical/racy-git.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ because in-core timestamps can have finer granularity than
4646
on-disk timestamps, resulting in meaningless changes when an
4747
inode is evicted from the inode cache. See commit 8ce13b0
4848
of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git
49-
([PATCH] Sync in core time granuality with filesystems,
49+
([PATCH] Sync in core time granularity with filesystems,
5050
2005-01-04).
5151

5252
Racy Git

0 commit comments

Comments
 (0)