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