typofix: documentation

Signed-off-by: Ondřej Bílka <neleai@seznam.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ondřej Bílka 2013-07-22 23:02:23 +02:00 committed by Junio C Hamano
parent 1114fc0237
commit 17b83d71d5
7 changed files with 7 additions and 7 deletions

View File

@ -1320,7 +1320,7 @@ So git bisect is unconditional goodness - and feel free to quote that
;-) ;-)
_____________ _____________
Acknowledgements Acknowledgments
---------------- ----------------
Many thanks to Junio Hamano for his help in reviewing this paper, for Many thanks to Junio Hamano for his help in reviewing this paper, for

View File

@ -83,7 +83,7 @@ eval "set -- $(git rev-parse --sq --prefix "$prefix" "$@")"
+ +
If you want to make sure that the output actually names an object in If you want to make sure that the output actually names an object in
your object database and/or can be used as a specific type of object your object database and/or can be used as a specific type of object
you require, you can add "^{type}" peeling operator to the parmeter. you require, you can add "^{type}" peeling operator to the parameter.
For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR` For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR`
names an existing object that is a commit-ish (i.e. a commit, or an names an existing object that is a commit-ish (i.e. a commit, or an
annotated tag that points at a commit). To make sure that `$VAR` annotated tag that points at a commit). To make sure that `$VAR`

View File

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

View File

@ -12,7 +12,7 @@ How to revert an existing commit
================================ ================================
One of the changes I pulled into the 'master' branch turns out to One of the changes I pulled into the 'master' branch turns out to
break building Git with GCC 2.95. While they were well intentioned break building Git with GCC 2.95. While they were well-intentioned
portability fixes, keeping things working with gcc-2.95 was also portability fixes, keeping things working with gcc-2.95 was also
important. Here is what I did to revert the change in the 'master' important. Here is what I did to revert the change in the 'master'
branch and to adjust the 'pu' branch, using core Git tools and branch and to adjust the 'pu' branch, using core Git tools and

View File

@ -369,7 +369,7 @@ each merge. The commits are:
* `E` changes `quux` to "xyzzy", and its merge `P` combines the * `E` changes `quux` to "xyzzy", and its merge `P` combines the
strings to "quux xyzzy". `P` is TREESAME to `O`, but not to `E`. strings to "quux xyzzy". `P` is TREESAME to `O`, but not to `E`.
* `X` is an indpendent root commit that added a new file `side`, and `Y` * `X` is an independent root commit that added a new file `side`, and `Y`
modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
`Q` is TREESAME to `P`, but not to `Y`. `Q` is TREESAME to `P`, but not to `Y`.

View File

@ -175,7 +175,7 @@ Git index format
A conflict is represented in the index as a set of higher stage entries. A conflict is represented in the index as a set of higher stage entries.
When a conflict is resolved (e.g. with "git add path"), these higher When a conflict is resolved (e.g. with "git add path"), these higher
stage entries will be removed and a stage-0 entry with proper resoluton stage entries will be removed and a stage-0 entry with proper resolution
is added. is added.
When these higher stage entries are removed, they are saved in the When these higher stage entries are removed, they are saved in the

View File

@ -46,7 +46,7 @@ because in-core timestamps can have finer granularity than
on-disk timestamps, resulting in meaningless changes when an on-disk timestamps, resulting in meaningless changes when an
inode is evicted from the inode cache. See commit 8ce13b0 inode is evicted from the inode cache. See commit 8ce13b0
of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git
([PATCH] Sync in core time granuality with filesystems, ([PATCH] Sync in core time granularity with filesystems,
2005-01-04). 2005-01-04).
Racy Git Racy Git