Documentation: spell.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-12-29 01:20:06 -08:00
parent f1ec72ba1e
commit 89438677ab
17 changed files with 20 additions and 20 deletions

View File

@ -138,7 +138,7 @@ mailing list archives for details).
git has a couple of alternatives, though, that you may find sufficient git has a couple of alternatives, though, that you may find sufficient
or even superior depending on your use. One is called "git-whatchanged" or even superior depending on your use. One is called "git-whatchanged"
(for obvious reasons) and the other one is called "pickaxe" ("a tool for (for obvious reasons) and the other one is called "pickaxe" ("a tool for
the software archeologist"). the software archaeologist").
The "git-whatchanged" script is a truly trivial script that can give you The "git-whatchanged" script is a truly trivial script that can give you
a good overview of what has changed in a file or a directory (or an a good overview of what has changed in a file or a directory (or an

View File

@ -117,7 +117,7 @@ git specific extension to diff format
What -p option produces is slightly different from the What -p option produces is slightly different from the
traditional diff format. traditional diff format.
1. It is preceeded with a "git diff" header, that looks like 1. It is preceded with a "git diff" header, that looks like
this: this:
diff --git a/file1 b/file2 diff --git a/file1 b/file2

View File

@ -21,7 +21,7 @@
--abbrev[=<n>]:: --abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object Instead of showing the full 40-byte hexadecimal object
name in diff-raw format output and diff-tree header name in diff-raw format output and diff-tree header
lines, show only handful dhexigits prefix. This is lines, show only handful hexdigits prefix. This is
independent of --full-index option above, which controls independent of --full-index option above, which controls
the diff-patch output format. Non default number of the diff-patch output format. Non default number of
digits can be specified with --abbrev=<n>. digits can be specified with --abbrev=<n>.

View File

@ -31,7 +31,7 @@ DISCUSSION
---------- ----------
The list of <file> given to the command is fed to `git-ls-files` The list of <file> given to the command is fed to `git-ls-files`
command to list files that are not registerd in the index and command to list files that are not registered in the index and
are not ignored/excluded by `$GIT_DIR/info/exclude` file or are not ignored/excluded by `$GIT_DIR/info/exclude` file or
`.gitignore` file in each directory. This means two things: `.gitignore` file in each directory. This means two things:

View File

@ -16,7 +16,7 @@ DESCRIPTION
----------- -----------
Imports a project from one or more Arch repositories. It will follow branches Imports a project from one or more Arch repositories. It will follow branches
and repositories within the namespaces defined by the <archive/branch> and repositories within the namespaces defined by the <archive/branch>
parameters suppplied. If it cannot find the remote branch a merge comes from parameters supplied. If it cannot find the remote branch a merge comes from
it will just import it as a regular commit. If it can find it, it will mark it it will just import it as a regular commit. If it can find it, it will mark it
as a merge whenever possible (see discussion below). as a merge whenever possible (see discussion below).

View File

@ -53,7 +53,7 @@ If '--cached' is specified, it allows you to ask:
contents (the ones I'd write with a "git-write-tree") contents (the ones I'd write with a "git-write-tree")
For example, let's say that you have worked on your working directory, updated For example, let's say that you have worked on your working directory, updated
some files in the index and are ready to commit. You want to see eactly some files in the index and are ready to commit. You want to see exactly
*what* you are going to commit is without having to write a new tree *what* you are going to commit is without having to write a new tree
object and compare it that way, and to do that, you just do object and compare it that way, and to do that, you just do
@ -110,7 +110,7 @@ NOTE: As with other commands of this type, "git-diff-index" does not
actually look at the contents of the file at all. So maybe actually look at the contents of the file at all. So maybe
`kernel/sched.c` hasn't actually changed, and it's just that you `kernel/sched.c` hasn't actually changed, and it's just that you
touched it. In either case, it's a note that you need to touched it. In either case, it's a note that you need to
"git-upate-index" it to make the index be in sync. "git-update-index" it to make the index be in sync.
NOTE: You can have a mixture of files show up as "has been updated" NOTE: You can have a mixture of files show up as "has been updated"
and "is still dirty in the working directory" together. You can always and "is still dirty in the working directory" together. You can always

View File

@ -62,7 +62,7 @@ separated with a single space are given.
-s:: -s::
By default, "git-diff-tree --stdin" shows differences, By default, "git-diff-tree --stdin" shows differences,
either in machine-readable form (without '-p') or in patch either in machine-readable form (without '-p') or in patch
form (with '-p'). This output can be supressed. It is form (with '-p'). This output can be suppressed. It is
only useful with '-v' flag. only useful with '-v' flag.
-v:: -v::

View File

@ -67,7 +67,7 @@ $ git diff HEAD^ HEAD <3>
<1> instead of using the tip of the current branch, compare with the <1> instead of using the tip of the current branch, compare with the
tip of "test" branch. tip of "test" branch.
<2> instead of comparing with the tip of "test" branch, compare with <2> instead of comparing with the tip of "test" branch, compare with
the tip of the curren branch, but limit the comparison to the the tip of the current branch, but limit the comparison to the
file "test". file "test".
<3> compare the version before the last commit and the last commit. <3> compare the version before the last commit and the last commit.
------------ ------------

View File

@ -74,7 +74,7 @@ OPTIONS
H:: cached H:: cached
M:: unmerged M:: unmerged
R:: removed/deleted R:: removed/deleted
C:: modifed/changed C:: modified/changed
K:: to be killed K:: to be killed
? other ? other

View File

@ -46,7 +46,7 @@ base-name::
output of the command. output of the command.
--stdout:: --stdout::
Write the pack contents (what would have been writtin to Write the pack contents (what would have been written to
.pack file) out to the standard output. .pack file) out to the standard output.
--window and --depth:: --window and --depth::

View File

@ -21,9 +21,9 @@ You can query/set/replace/unset options with this command. The name is
actually the section and the key separated by a dot, and the value will be actually the section and the key separated by a dot, and the value will be
escaped. escaped.
If you want to set/unset an option which can occor on multiple lines, you If you want to set/unset an option which can occur on multiple lines, you
should provide a POSIX regex for the value. If you want to handle the lines should provide a POSIX regex for the value. If you want to handle the lines
*not* matching the regex, just prepend a single exlamation mark in front *not* matching the regex, just prepend a single exclamation mark in front
(see EXAMPLES). (see EXAMPLES).
This command will fail if This command will fail if

View File

@ -129,7 +129,7 @@ the marked commit in the list.
+ +
Commits marked with (^) are not parents of the immediately preceding commit. Commits marked with (^) are not parents of the immediately preceding commit.
These "breaks" represent necessary discontinuities implied by trying to These "breaks" represent necessary discontinuities implied by trying to
represent an arbtirary DAG in a linear form. represent an arbitrary DAG in a linear form.
+ +
`--show-breaks` is only valid if `--merge-order` is also specified. `--show-breaks` is only valid if `--merge-order` is also specified.

View File

@ -85,7 +85,7 @@ Following these N lines, one-line log for each commit is
displayed, indented N places. If a commit is on the I-th displayed, indented N places. If a commit is on the I-th
branch, the I-th indentation character shows a '+' sign; branch, the I-th indentation character shows a '+' sign;
otherwise it shows a space. Each commit shows a short name that otherwise it shows a space. Each commit shows a short name that
can be used as an exended SHA1 to name that commit. can be used as an extended SHA1 to name that commit.
The following example shows three branches, "master", "fixes" The following example shows three branches, "master", "fixes"
and "mhf": and "mhf":

View File

@ -40,7 +40,7 @@ OPTIONS
-s <start_rev>:: -s <start_rev>::
Start importing at this SVN change number. The default is 1. Start importing at this SVN change number. The default is 1.
+ +
When importing incementally, you might need to edit the .git/svn2git file. When importing incrementally, you might need to edit the .git/svn2git file.
-i:: -i::
Import-only: don't perform a checkout after importing. This option Import-only: don't perform a checkout after importing. This option

View File

@ -19,7 +19,7 @@ hash::
In git's context, synonym to object name. In git's context, synonym to object name.
object database:: object database::
Stores a set of "objects", and an individial object is identified Stores a set of "objects", and an individual object is identified
by its object name. The objects usually live in `$GIT_DIR/objects/`. by its object name. The objects usually live in `$GIT_DIR/objects/`.
blob object:: blob object::

View File

@ -24,7 +24,7 @@ Then do
git bisect bad master <- mark "master" as the bad state git bisect bad master <- mark "master" as the bad state
git bisect good ORIG_HEAD <- mark ORIG_HEAD as good (or git bisect good ORIG_HEAD <- mark ORIG_HEAD as good (or
whatever other known-good whatever other known-good
thing you booted laste) thing you booted last)
and at this point "git bisect" will churn for a while, and tell you what and at this point "git bisect" will churn for a while, and tell you what
the mid-point between those two commits are, and check that state out as the mid-point between those two commits are, and check that state out as

View File

@ -21,7 +21,7 @@ outside world but sometimes useful for private repository.
. You can be using `objects/info/alternates` mechanism, or . You can be using `objects/info/alternates` mechanism, or
`$GIT_ALTERNATE_OBJECT_DIRECTORIES` mechanism to 'borrow' `$GIT_ALTERNATE_OBJECT_DIRECTORIES` mechanism to 'borrow'
objects from other object stores. A repository with this kind objects from other object stores. A repository with this kind
of incompete object store is not suitable to be published for of incomplete object store is not suitable to be published for
use with dumb transports but otherwise is OK as long as use with dumb transports but otherwise is OK as long as
`objects/info/alternates` points at the right object stores `objects/info/alternates` points at the right object stores
it borrows from. it borrows from.
@ -106,7 +106,7 @@ info/refs::
up-to-date if the repository is published for dumb up-to-date if the repository is published for dumb
transports. The `git-receive-pack` command, which is transports. The `git-receive-pack` command, which is
run on a remote repository when you `git push` into it, run on a remote repository when you `git push` into it,
runs `hooks/update` hook to help you achive this. runs `hooks/update` hook to help you achieve this.
info/grafts:: info/grafts::
This file records fake commit ancestry information, to This file records fake commit ancestry information, to