typofix: documentation
Signed-off-by: Ondřej Bílka <neleai@seznam.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ondřej Bílka committed
Jul 22, 2013 at 23:02 UTC
17b83d71d52a5eb6a621be22daa624414d3ee514
7 files changed
+7
-7
Documentation/git-bisect-lk2009.txt
+1
-1
@@ -1320,7 +1320,7 @@ So git bisect is unconditional goodness - and feel free to quote that
1320
;-)
1321
_____________
1322
1323
-Acknowledgements
1323
+Acknowledgments
1324
----------------
1325
1326
Many thanks to Junio Hamano for his help in reviewing this paper, for
Documentation/git-rev-parse.txt
+1
-1
@@ -83,7 +83,7 @@ eval "set -- $(git rev-parse --sq --prefix "$prefix" "$@")"
83
+
84
If you want to make sure that the output actually names an object in
85
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.
87
For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR`
88
names an existing object that is a commit-ish (i.e. a commit, or an
89
annotated tag that points at a commit). To make sure that `$VAR`
Documentation/gitweb.txt
+1
-1
@@ -504,7 +504,7 @@ repositories, you can configure Apache like this:
504
505
The above configuration expects your public repositories to live under
506
'/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
508
start your linkgit:git-daemon[1] with `--base-path=/pub/git --export-all`
509
then you can even use the `git://` URL with exactly the same path.
510
Documentation/howto/revert-branch-rebase.txt
+1
-1
@@ -12,7 +12,7 @@ How to revert an existing commit
12
================================
13
14
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
16
portability fixes, keeping things working with gcc-2.95 was also
17
important. Here is what I did to revert the change in the 'master'
18
branch and to adjust the 'pu' branch, using core Git tools and
Documentation/rev-list-options.txt
+1
-1
@@ -369,7 +369,7 @@ each merge. The commits are:
369
* `E` changes `quux` to "xyzzy", and its merge `P` combines the
370
strings to "quux xyzzy". `P` is TREESAME to `O`, but not to `E`.
371
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`
373
modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
374
`Q` is TREESAME to `P`, but not to `Y`.
375
Documentation/technical/index-format.txt
+1
-1
@@ -175,7 +175,7 @@ Git index format
175
176
A conflict is represented in the index as a set of higher stage entries.
177
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
179
is added.
180
181
When these higher stage entries are removed, they are saved in the
Documentation/technical/racy-git.txt
+1
-1
@@ -46,7 +46,7 @@ because in-core timestamps can have finer granularity than
46
on-disk timestamps, resulting in meaningless changes when an
47
inode is evicted from the inode cache. See commit 8ce13b0
48
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,
50
2005-01-04).
51
52
Racy Git