summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-29 09:20:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-29 09:32:56 (GMT)
commit89438677abaae1a8ffc3c0905f3355a590da7bf4 (patch)
treef1d43ab8459bcc2010220c32c03001e7588b26f6
parentf1ec72ba1e52783179a7da7defaab0458c895617 (diff)
downloadgit-89438677abaae1a8ffc3c0905f3355a590da7bf4.zip
git-89438677abaae1a8ffc3c0905f3355a590da7bf4.tar.gz
git-89438677abaae1a8ffc3c0905f3355a590da7bf4.tar.bz2
Documentation: spell.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/cvs-migration.txt2
-rw-r--r--Documentation/diff-format.txt2
-rw-r--r--Documentation/diff-options.txt2
-rw-r--r--Documentation/git-add.txt2
-rw-r--r--Documentation/git-archimport.txt2
-rw-r--r--Documentation/git-diff-index.txt4
-rw-r--r--Documentation/git-diff-tree.txt2
-rw-r--r--Documentation/git-diff.txt2
-rw-r--r--Documentation/git-ls-files.txt2
-rw-r--r--Documentation/git-pack-objects.txt2
-rw-r--r--Documentation/git-repo-config.txt4
-rw-r--r--Documentation/git-rev-list.txt2
-rw-r--r--Documentation/git-show-branch.txt2
-rw-r--r--Documentation/git-svnimport.txt2
-rw-r--r--Documentation/glossary.txt2
-rw-r--r--Documentation/howto/isolate-bugs-with-bisect.txt2
-rw-r--r--Documentation/repository-layout.txt4
17 files changed, 20 insertions, 20 deletions
diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt
index dc9387b..8fd1a33 100644
--- a/Documentation/cvs-migration.txt
+++ b/Documentation/cvs-migration.txt
@@ -138,7 +138,7 @@ mailing list archives for details).
git has a couple of alternatives, though, that you may find sufficient
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
-the software archeologist").
+the software archaeologist").
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
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 97756ec..0398b40 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -117,7 +117,7 @@ git specific extension to diff format
What -p option produces is slightly different from the
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:
diff --git a/file1 b/file2
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 9e574a0..5c85167 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -21,7 +21,7 @@
--abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object
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
the diff-patch output format. Non default number of
digits can be specified with --abbrev=<n>.
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 4cae412..89e4614 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -31,7 +31,7 @@ DISCUSSION
----------
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
`.gitignore` file in each directory. This means two things:
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index a2bd788..fe57fe1 100644
--- a/Documentation/git-archimport.txt
+++ b/Documentation/git-archimport.txt
@@ -16,7 +16,7 @@ DESCRIPTION
-----------
Imports a project from one or more Arch repositories. It will follow branches
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
as a merge whenever possible (see discussion below).
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index dba6d30..5d2096a 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -53,7 +53,7 @@ If '--cached' is specified, it allows you to ask:
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
-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
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
`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
-"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"
and "is still dirty in the working directory" together. You can always
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 9a2947e..f2312f4 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -62,7 +62,7 @@ separated with a single space are given.
-s::
By default, "git-diff-tree --stdin" shows differences,
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.
-v::
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index b04f393..ca41634 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -67,7 +67,7 @@ $ git diff HEAD^ HEAD <3>
<1> instead of using the tip of the current branch, compare with the
tip of "test" branch.
<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".
<3> compare the version before the last commit and the last commit.
------------
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 186f3bb..e42af5e 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -74,7 +74,7 @@ OPTIONS
H:: cached
M:: unmerged
R:: removed/deleted
- C:: modifed/changed
+ C:: modified/changed
K:: to be killed
? other
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 009ec5a..2d67d39 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -46,7 +46,7 @@ base-name::
output of the command.
--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.
--window and --depth::
diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
index 5eefe02..3069464 100644
--- a/Documentation/git-repo-config.txt
+++ b/Documentation/git-repo-config.txt
@@ -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
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
-*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).
This command will fail if
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 064ccb1..75c9968 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -129,7 +129,7 @@ the marked commit in the list.
+
Commits marked with (^) are not parents of the immediately preceding commit.
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.
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index ffe64d8..5b76f3b 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -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
branch, the I-th indentation character shows a '+' sign;
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"
and "mhf":
diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index f8dbee7..6e342f5 100644
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/git-svnimport.txt
@@ -40,7 +40,7 @@ OPTIONS
-s <start_rev>::
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::
Import-only: don't perform a checkout after importing. This option
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 520f4c5..2331be5 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -19,7 +19,7 @@ hash::
In git's context, synonym to object name.
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/`.
blob object::
diff --git a/Documentation/howto/isolate-bugs-with-bisect.txt b/Documentation/howto/isolate-bugs-with-bisect.txt
index 4009495..edbcd4c 100644
--- a/Documentation/howto/isolate-bugs-with-bisect.txt
+++ b/Documentation/howto/isolate-bugs-with-bisect.txt
@@ -24,7 +24,7 @@ Then do
git bisect bad master <- mark "master" as the bad state
git bisect good ORIG_HEAD <- mark ORIG_HEAD as good (or
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
the mid-point between those two commits are, and check that state out as
diff --git a/Documentation/repository-layout.txt b/Documentation/repository-layout.txt
index 1b5f228..0347cab 100644
--- a/Documentation/repository-layout.txt
+++ b/Documentation/repository-layout.txt
@@ -21,7 +21,7 @@ outside world but sometimes useful for private repository.
. You can be using `objects/info/alternates` mechanism, or
`$GIT_ALTERNATE_OBJECT_DIRECTORIES` mechanism to 'borrow'
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
`objects/info/alternates` points at the right object stores
it borrows from.
@@ -106,7 +106,7 @@ info/refs::
up-to-date if the repository is published for dumb
transports. The `git-receive-pack` command, which is
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::
This file records fake commit ancestry information, to