Some typos and light editing of various manpages
Typos, light editing and clarifications. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Christian Meder committed
Oct 5, 2005 at 15:08 UTC
f73ae1fc5d5308fecf0a4bdbd7312f7f5b00df55
14 files changed
+39
-38
Documentation/cvs-migration.txt
+2
-2
@@ -24,7 +24,7 @@ The good news is that most people don't do that, and in fact most sane
24
people think it's a bug in CVS that makes it tag (and check in changes)
25
one file at a time. So most projects you'll ever see will use CVS
26
'as if' it was sane. In which case you'll find it very easy indeed to
27
-move over to Git.
27
+move over to git.
28
29
First off: this is not a git tutorial. See
30
link:tutorial.html[Documentation/tutorial.txt] for how git
@@ -229,7 +229,7 @@ does rename or copy would not show in the output, and if the
229
"o-file.c", it would find the commit that changed the statement
230
when it was in "o-file.c".
231
232
-NOTE: The current versions of "git-diff-tree -C" is not eager
232
+NOTE: The current version of "git-diff-tree -C" is not eager
233
enough to find copies, and it will miss the fact that a-file.c
234
was created by copying o-file.c unless o-file.c was somehow
235
changed in the same commit.
Documentation/diff-format.txt
+6
-7
@@ -1,8 +1,8 @@
1
The output format from "git-diff-index", "git-diff-tree" and
2
"git-diff-files" are very similar.
3
4
-These commands all compare two sets of things; what are
5
-compared are different:
4
+These commands all compare two sets of things; what is
5
+compared differs:
6
7
git-diff-index <tree-ish>::
8
compares the <tree-ish> and the files on the filesystem.
@@ -46,7 +46,7 @@ That is, from the left to the right:
46
. path for "dst"; only exists for C or R.
47
. an LF or a NUL when '-z' option is used, to terminate the record.
48
49
-<sha1> is shown as all 0's if new is a file on the filesystem
49
+<sha1> is shown as all 0's if a file is new on the filesystem
50
and it is out of sync with the cache.
51
52
Example:
@@ -91,7 +91,7 @@ For a path that is added, removed, or modified,
91
where:
92
93
<old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the
94
- contents of <old|ne>,
94
+ contents of <old|new>,
95
<old|new>-hex:: are the 40-hexdigit SHA1 hashes,
96
<old|new>-mode:: are the octal representation of the file modes.
97
@@ -121,12 +121,11 @@ The `a/` and `b/` filenames are the same unless rename/copy is
121
involved. Especially, even for a creation or a deletion,
122
`/dev/null` is _not_ used in place of `a/` or `b/` filenames.
123
+
124
-When rename/copy is involved, `file1` and `file2` shows the
124
+When rename/copy is involved, `file1` and `file2` show the
125
name of the source file of the rename/copy and the name of
126
the file that rename/copy produces, respectively.
127
128
-2. It is followed by extended header lines that are one or
129
- more of:
128
+2. It is followed by one or more extended header lines:
129
130
old mode <mode>
131
new mode <mode>
Documentation/diff-options.txt
+9
-10
@@ -5,9 +5,8 @@
5
Synonym for "-p".
6
7
-r::
8
- Look recursively in subdirectories; this flag does not
9
- mean anything to commands other than "git-diff-tree";
10
- other diff commands always look at all the subdirectories.
8
+ Look recursively in subdirectories; only used by "git-diff-tree";
9
+ other diff commands always work recursively.
10
11
-z::
12
\0 line termination on output
@@ -28,26 +27,26 @@
27
Detect copies as well as renames.
28
29
--find-copies-harder::
31
- By default, -C option finds copies only if the original
32
- file of the copy was modified in the same changeset for
33
- performance reasons. This flag makes the command
30
+ For performance reasons, by default, -C option finds copies only
31
+ if the original file of the copy was modified in the same
32
+ changeset. This flag makes the command
33
inspect unmodified files as candidates for the source of
34
copy. This is a very expensive operation for large
35
projects, so use it with caution.
36
37
-l<num>::
38
-M and -C options require O(n^2) processing time where n
40
- in the number of potential rename/copy targets. This
39
+ is the number of potential rename/copy targets. This
40
option prevents rename/copy detection from running if
42
- the number of rename/copy targets exceed the specified
41
+ the number of rename/copy targets exceeds the specified
42
number.
43
44
-S<string>::
46
- Look for differences that contains the change in <string>.
45
+ Look for differences that contain the change in <string>.
46
47
--pickaxe-all::
48
When -S finds a change, show all the changes in that
50
- changeset, not just the files that contains the change
49
+ changeset, not just the files that contain the change
50
in <string>.
51
52
-O<orderfile>::
Documentation/diffcore.txt
+3
-3
@@ -177,7 +177,7 @@ diffcore-merge-broken
177
---------------------
178
179
This transformation is used to merge filepairs broken by
180
-diffcore-break, and were not transformed into rename/copy by
180
+diffcore-break, and not transformed into rename/copy by
181
diffcore-rename, back into a single modification. This always
182
runs when diffcore-break is used.
183
@@ -206,10 +206,10 @@ like these:
206
* -B/60 (the same as above, since diffcore-break defaults to 50%).
207
208
Note that earlier implementation left a broken pair as a separate
209
-creation and deletion patches. This was unnecessary hack and
209
+creation and deletion patches. This was an unnecessary hack and
210
the latest implementation always merges all the broken pairs
211
back into modifications, but the resulting patch output is
212
-formatted differently to still let the reviewing easier for such
212
+formatted differently for easier review in case of such
213
a complete rewrite by showing the entire contents of old version
214
prefixed with '-', followed by the entire contents of new
215
version prefixed with '+'.
Documentation/git-add.txt
+1
-1
@@ -11,7 +11,7 @@ SYNOPSIS
11
12
DESCRIPTION
13
-----------
14
-A simple wrapper to git-update-index to add files to the cache for people used
14
+A simple wrapper for git-update-index to add files to the cache for people used
15
to do "cvs add".
16
17
OPTIONS
Documentation/git-apply.txt
+1
-1
@@ -13,7 +13,7 @@ SYNOPSIS
13
14
DESCRIPTION
15
-----------
16
-Reads supplied diff output and applies it on a GIT index file
16
+Reads supplied diff output and applies it on a git index file
17
and a work tree.
18
19
OPTIONS
Documentation/git-applymbox.txt
+1
-1
@@ -22,7 +22,7 @@ OPTIONS
22
-q::
23
Apply patches interactively. The user will be given
24
opportunity to edit the log message and the patch before
25
- attempting to apply patch in each e-mail message.
25
+ attempting to apply it.
26
27
-k::
28
Usually the program 'cleans up' the Subject: header line
Documentation/git-archimport.txt
+9
-6
@@ -20,20 +20,23 @@ it will just import it as a regular commit. If it can find it, it will mark it
20
as a merge whenever possible (see discussion below).
21
22
The script expects you to provide the key roots where it can start the import
23
-from an 'initial import' or 'tag' type of Arch commit. It will follow and import
24
-new branches within the provided roots.
23
+from an 'initial import' or 'tag' type of Arch commit. It will follow and
24
+import new branches within the provided roots.
25
26
It expects to be dealing with one project only. If it sees
27
-branches that have different roots, it will refuse to run. In that case, edit your
28
-<archive/branch> parameters to define clearly the scope of the import.
27
+branches that have different roots, it will refuse to run. In that case,
28
+edit your <archive/branch> parameters to define clearly the scope of the
29
+import.
30
30
-`git-archimport` uses `tla` extensively in the background to access the Arch repository.
31
+`git-archimport` uses `tla` extensively in the background to access the
32
+Arch repository.
33
Make sure you have a recent version of `tla` available in the path. `tla` must
34
know about the repositories you pass to `git-archimport`.
35
36
For the initial import `git-archimport` expects to find itself in an empty
37
directory. To follow the development of a project that uses Arch, rerun
36
-`git-archimport` with the same parameters as the initial import to perform incremental imports.
38
+`git-archimport` with the same parameters as the initial import to perform
39
+incremental imports.
40
41
MERGES
42
------
Documentation/git-bisect.txt
+1
-1
@@ -76,7 +76,7 @@ During the bisection process, you can say
76
77
to see the currently remaining suspects in `gitk`.
78
79
-The good/bad you told the command is logged, and `git bisect
79
+The good/bad input is logged, and `git bisect
80
log` shows what you have done so far. You can truncate its
81
output somewhere and save it in a file, and run
82
Documentation/git-branch.txt
+1
-1
@@ -23,7 +23,7 @@ OPTIONS
23
The name of the branch to create.
24
25
start-point::
26
- Where to make the branch; defaults to HEAD.
26
+ Where to create the branch; defaults to HEAD.
27
28
Author
29
------
Documentation/git-cat-file.txt
+1
-1
@@ -32,7 +32,7 @@ OPTIONS
32
33
<type>::
34
Typically this matches the real type of <object> but asking
35
- for a type that can trivially dereferenced from the given
35
+ for a type that can trivially be dereferenced from the given
36
<object> is also permitted. An example is to ask for a
37
"tree" with <object> being a commit object that contains it,
38
or to ask for a "blob" with <object> being a tag object that
Documentation/git-cherry-pick.txt
+1
-1
@@ -22,7 +22,7 @@ OPTIONS
22
Commit to cherry-pick.
23
24
-r::
25
- Usuall the command appends which commit was
25
+ Usually the command appends which commit was
26
cherry-picked after the original commit message when
27
making a commit. This option, '--replay', causes it to
28
use the original commit message intact. This is useful
Documentation/git-clone-pack.txt
+2
-2
@@ -26,8 +26,8 @@ OPTIONS
26
27
--exec=<git-upload-pack>::
28
Use this to specify the path to 'git-upload-pack' on the
29
- remote side, if is not found on your $PATH.
30
- Installations of sshd ignores the user's environment
29
+ remote side, if it is not found on your $PATH.
30
+ Installations of sshd ignore the user's environment
31
setup scripts for login shells (e.g. .bash_profile) and
32
your privately installed GIT may not be found on the system
33
default $PATH. Another workaround suggested is to set
Documentation/git-commit-tree.txt
+1
-1
@@ -36,7 +36,7 @@ OPTIONS
36
An existing tree object
37
38
-p <parent commit>::
39
- Each '-p' indicates a the id of a parent commit object.
39
+ Each '-p' indicates the id of a parent commit object.
40
41
42
Commit Information