Documentation: spell.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Dec 29, 2005 at 01:20 UTC
89438677abaae1a8ffc3c0905f3355a590da7bf4
17 files changed
+20
-20
Documentation/cvs-migration.txt
+1
-1
@@ -138,7 +138,7 @@ mailing list archives for details).
138
git has a couple of alternatives, though, that you may find sufficient
139
or even superior depending on your use. One is called "git-whatchanged"
140
(for obvious reasons) and the other one is called "pickaxe" ("a tool for
141
-the software archeologist").
141
+the software archaeologist").
142
143
The "git-whatchanged" script is a truly trivial script that can give you
144
a good overview of what has changed in a file or a directory (or an
Documentation/diff-format.txt
+1
-1
@@ -117,7 +117,7 @@ git specific extension to diff format
117
What -p option produces is slightly different from the
118
traditional diff format.
119
120
-1. It is preceeded with a "git diff" header, that looks like
120
+1. It is preceded with a "git diff" header, that looks like
121
this:
122
123
diff --git a/file1 b/file2
Documentation/diff-options.txt
+1
-1
@@ -21,7 +21,7 @@
21
--abbrev[=<n>]::
22
Instead of showing the full 40-byte hexadecimal object
23
name in diff-raw format output and diff-tree header
24
- lines, show only handful dhexigits prefix. This is
24
+ lines, show only handful hexdigits prefix. This is
25
independent of --full-index option above, which controls
26
the diff-patch output format. Non default number of
27
digits can be specified with --abbrev=<n>.
Documentation/git-add.txt
+1
-1
@@ -31,7 +31,7 @@ DISCUSSION
31
----------
32
33
The list of <file> given to the command is fed to `git-ls-files`
34
-command to list files that are not registerd in the index and
34
+command to list files that are not registered in the index and
35
are not ignored/excluded by `$GIT_DIR/info/exclude` file or
36
`.gitignore` file in each directory. This means two things:
37
Documentation/git-archimport.txt
+1
-1
@@ -16,7 +16,7 @@ DESCRIPTION
16
-----------
17
Imports a project from one or more Arch repositories. It will follow branches
18
and repositories within the namespaces defined by the <archive/branch>
19
-parameters suppplied. If it cannot find the remote branch a merge comes from
19
+parameters supplied. If it cannot find the remote branch a merge comes from
20
it will just import it as a regular commit. If it can find it, it will mark it
21
as a merge whenever possible (see discussion below).
22
Documentation/git-diff-index.txt
+2
-2
@@ -53,7 +53,7 @@ If '--cached' is specified, it allows you to ask:
53
contents (the ones I'd write with a "git-write-tree")
54
55
For example, let's say that you have worked on your working directory, updated
56
-some files in the index and are ready to commit. You want to see eactly
56
+some files in the index and are ready to commit. You want to see exactly
57
*what* you are going to commit is without having to write a new tree
58
object and compare it that way, and to do that, you just do
59
@@ -110,7 +110,7 @@ NOTE: As with other commands of this type, "git-diff-index" does not
110
actually look at the contents of the file at all. So maybe
111
`kernel/sched.c` hasn't actually changed, and it's just that you
112
touched it. In either case, it's a note that you need to
113
-"git-upate-index" it to make the index be in sync.
113
+"git-update-index" it to make the index be in sync.
114
115
NOTE: You can have a mixture of files show up as "has been updated"
116
and "is still dirty in the working directory" together. You can always
Documentation/git-diff-tree.txt
+1
-1
@@ -62,7 +62,7 @@ separated with a single space are given.
62
-s::
63
By default, "git-diff-tree --stdin" shows differences,
64
either in machine-readable form (without '-p') or in patch
65
- form (with '-p'). This output can be supressed. It is
65
+ form (with '-p'). This output can be suppressed. It is
66
only useful with '-v' flag.
67
68
-v::
Documentation/git-diff.txt
+1
-1
@@ -67,7 +67,7 @@ $ git diff HEAD^ HEAD <3>
67
<1> instead of using the tip of the current branch, compare with the
68
tip of "test" branch.
69
<2> instead of comparing with the tip of "test" branch, compare with
70
-the tip of the curren branch, but limit the comparison to the
70
+the tip of the current branch, but limit the comparison to the
71
file "test".
72
<3> compare the version before the last commit and the last commit.
73
------------
Documentation/git-ls-files.txt
+1
-1
@@ -74,7 +74,7 @@ OPTIONS
74
H:: cached
75
M:: unmerged
76
R:: removed/deleted
77
- C:: modifed/changed
77
+ C:: modified/changed
78
K:: to be killed
79
? other
80
Documentation/git-pack-objects.txt
+1
-1
@@ -46,7 +46,7 @@ base-name::
46
output of the command.
47
48
--stdout::
49
- Write the pack contents (what would have been writtin to
49
+ Write the pack contents (what would have been written to
50
.pack file) out to the standard output.
51
52
--window and --depth::
Documentation/git-repo-config.txt
+2
-2
@@ -21,9 +21,9 @@ You can query/set/replace/unset options with this command. The name is
21
actually the section and the key separated by a dot, and the value will be
22
escaped.
23
24
-If you want to set/unset an option which can occor on multiple lines, you
24
+If you want to set/unset an option which can occur on multiple lines, you
25
should provide a POSIX regex for the value. If you want to handle the lines
26
-*not* matching the regex, just prepend a single exlamation mark in front
26
+*not* matching the regex, just prepend a single exclamation mark in front
27
(see EXAMPLES).
28
29
This command will fail if
Documentation/git-rev-list.txt
+1
-1
@@ -129,7 +129,7 @@ the marked commit in the list.
129
+
130
Commits marked with (^) are not parents of the immediately preceding commit.
131
These "breaks" represent necessary discontinuities implied by trying to
132
-represent an arbtirary DAG in a linear form.
132
+represent an arbitrary DAG in a linear form.
133
+
134
`--show-breaks` is only valid if `--merge-order` is also specified.
135
Documentation/git-show-branch.txt
+1
-1
@@ -85,7 +85,7 @@ Following these N lines, one-line log for each commit is
85
displayed, indented N places. If a commit is on the I-th
86
branch, the I-th indentation character shows a '+' sign;
87
otherwise it shows a space. Each commit shows a short name that
88
-can be used as an exended SHA1 to name that commit.
88
+can be used as an extended SHA1 to name that commit.
89
90
The following example shows three branches, "master", "fixes"
91
and "mhf":
Documentation/git-svnimport.txt
+1
-1
@@ -40,7 +40,7 @@ OPTIONS
40
-s <start_rev>::
41
Start importing at this SVN change number. The default is 1.
42
+
43
-When importing incementally, you might need to edit the .git/svn2git file.
43
+When importing incrementally, you might need to edit the .git/svn2git file.
44
45
-i::
46
Import-only: don't perform a checkout after importing. This option
Documentation/glossary.txt
+1
-1
@@ -19,7 +19,7 @@ hash::
19
In git's context, synonym to object name.
20
21
object database::
22
- Stores a set of "objects", and an individial object is identified
22
+ Stores a set of "objects", and an individual object is identified
23
by its object name. The objects usually live in `$GIT_DIR/objects/`.
24
25
blob object::
Documentation/howto/isolate-bugs-with-bisect.txt
+1
-1
@@ -24,7 +24,7 @@ Then do
24
git bisect bad master <- mark "master" as the bad state
25
git bisect good ORIG_HEAD <- mark ORIG_HEAD as good (or
26
whatever other known-good
27
- thing you booted laste)
27
+ thing you booted last)
28
29
and at this point "git bisect" will churn for a while, and tell you what
30
the mid-point between those two commits are, and check that state out as
Documentation/repository-layout.txt
+2
-2
@@ -21,7 +21,7 @@ outside world but sometimes useful for private repository.
21
. You can be using `objects/info/alternates` mechanism, or
22
`$GIT_ALTERNATE_OBJECT_DIRECTORIES` mechanism to 'borrow'
23
objects from other object stores. A repository with this kind
24
-of incompete object store is not suitable to be published for
24
+of incomplete object store is not suitable to be published for
25
use with dumb transports but otherwise is OK as long as
26
`objects/info/alternates` points at the right object stores
27
it borrows from.
@@ -106,7 +106,7 @@ info/refs::
106
up-to-date if the repository is published for dumb
107
transports. The `git-receive-pack` command, which is
108
run on a remote repository when you `git push` into it,
109
- runs `hooks/update` hook to help you achive this.
109
+ runs `hooks/update` hook to help you achieve this.
110
111
info/grafts::
112
This file records fake commit ancestry information, to