Documentation: fix typos, grammar, asciidoc syntax
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
87c8a56e4f
commit
04c8ce9c1c
@ -58,7 +58,7 @@ Possible status letters are:
|
||||
be committed)
|
||||
- X: "unknown" change type (most probably a bug, please report it)
|
||||
|
||||
Status letters C and M are always followed by a score (denoting the
|
||||
Status letters C and R are always followed by a score (denoting the
|
||||
percentage of similarity between the source and target of the move or
|
||||
copy), and are the only ones to be so.
|
||||
|
||||
|
@ -143,15 +143,15 @@ different from it.
|
||||
|
||||
A `-` character in the column N means that the line appears in
|
||||
fileN but it does not appear in the result. A `+` character
|
||||
in the column N means that the line appears in the last file,
|
||||
in the column N means that the line appears in the result,
|
||||
and fileN does not have that line (in other words, the line was
|
||||
added, from the point of view of that parent).
|
||||
|
||||
In the above example output, the function signature was changed
|
||||
from both files (hence two `-` removals from both file1 and
|
||||
file2, plus `++` to mean one line that was added does not appear
|
||||
in either file1 nor file2). Also two other lines are the same
|
||||
from file1 but do not appear in file2 (hence prefixed with ` +`).
|
||||
in either file1 nor file2). Also eight other lines are the same
|
||||
from file1 but do not appear in file2 (hence prefixed with `{plus}`).
|
||||
|
||||
When shown by `git diff-tree -c`, it compares the parents of a
|
||||
merge commit with the merge result (i.e. file1..fileN are the
|
||||
|
@ -159,7 +159,7 @@ but can be used to amend a merge commit.
|
||||
'git-commit' if any paths are given on the command line,
|
||||
in which case this option can be omitted.
|
||||
If this option is specified together with '--amend', then
|
||||
no paths need be specified, which can be used to amend
|
||||
no paths need to be specified, which can be used to amend
|
||||
the last commit without committing changes that have
|
||||
already been staged.
|
||||
|
||||
|
@ -43,7 +43,7 @@ include::diff-options.txt[]
|
||||
show tree entry itself as well as subtrees. Implies -r.
|
||||
|
||||
--root::
|
||||
When '--root' is specified the initial commit will be showed as a big
|
||||
When '--root' is specified the initial commit will be shown as a big
|
||||
creation event. This is equivalent to a diff against the NULL tree.
|
||||
|
||||
--stdin::
|
||||
|
@ -13,7 +13,7 @@ SYNOPSIS
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Reading a single e-mail message from the standard input, and
|
||||
Reads a single e-mail message from the standard input, and
|
||||
writes the commit log message in <msg> file, and the patches in
|
||||
<patch> file. The author name, e-mail and e-mail subject are
|
||||
written out to the standard output to be used by 'git-am'
|
||||
|
@ -86,7 +86,7 @@ post-receive Hook
|
||||
-----------------
|
||||
After all refs were updated (or attempted to be updated), if any
|
||||
ref update was successful, and if $GIT_DIR/hooks/post-receive
|
||||
file exists and is executable, it will be invoke once with no
|
||||
file exists and is executable, it will be invoked once with no
|
||||
parameters. The standard input of the hook will be one line
|
||||
for each successfully updated ref:
|
||||
|
||||
@ -133,7 +133,7 @@ post-update Hook
|
||||
----------------
|
||||
After all other processing, if at least one ref was updated, and
|
||||
if $GIT_DIR/hooks/post-update file exists and is executable, then
|
||||
post-update will called with the list of refs that have been updated.
|
||||
post-update will be called with the list of refs that have been updated.
|
||||
This can be used to implement any repository wide cleanup tasks.
|
||||
|
||||
The exit code from this hook invocation is ignored; the only thing
|
||||
|
@ -28,7 +28,7 @@ updated. This command is to manage the information recorded in it.
|
||||
|
||||
The subcommand "expire" is used to prune older reflog entries.
|
||||
Entries older than `expire` time, or entries older than
|
||||
`expire-unreachable` time and are not reachable from the current
|
||||
`expire-unreachable` time and not reachable from the current
|
||||
tip, are removed from the reflog. This is typically not used
|
||||
directly by the end users -- instead, see linkgit:git-gc[1].
|
||||
|
||||
@ -71,7 +71,7 @@ them.
|
||||
which in turn defaults to 90 days.
|
||||
|
||||
--expire-unreachable=<time>::
|
||||
Entries older than this time and are not reachable from
|
||||
Entries older than this time and not reachable from
|
||||
the current tip of the branch are pruned. Without the
|
||||
option it is taken from configuration
|
||||
`gc.reflogExpireUnreachable`, which in turn defaults to
|
||||
|
@ -30,7 +30,7 @@ OPTIONS
|
||||
-------
|
||||
<rev>::
|
||||
Arbitrary extended SHA1 expression (see linkgit:git-rev-parse[1])
|
||||
that typically names a branch HEAD or a tag.
|
||||
that typically names a branch head or a tag.
|
||||
|
||||
<glob>::
|
||||
A glob pattern that matches branch or tag names under
|
||||
|
@ -85,7 +85,7 @@ use by subsequent users cloning the superproject. If the URL is
|
||||
given relative to the superproject's repository, the presumption
|
||||
is the superproject and submodule repositories will be kept
|
||||
together in the same relative location, and only the
|
||||
superproject's URL need be provided: git-submodule will correctly
|
||||
superproject's URL needs to be provided: git-submodule will correctly
|
||||
locate the submodule using the relative URL in .gitmodules.
|
||||
|
||||
status::
|
||||
|
@ -55,7 +55,7 @@ OPTIONS
|
||||
default behavior is to error out. This option makes
|
||||
'git-update-index' continue anyway.
|
||||
|
||||
--ignore-submodules:
|
||||
--ignore-submodules::
|
||||
Do not try to update submodules. This option is only respected
|
||||
when passed before --refresh.
|
||||
|
||||
@ -78,9 +78,9 @@ OPTIONS
|
||||
|
||||
--assume-unchanged::
|
||||
--no-assume-unchanged::
|
||||
When these flags are specified, the object name recorded
|
||||
When these flags are specified, the object names recorded
|
||||
for the paths are not updated. Instead, these options
|
||||
sets and unsets the "assume unchanged" bit for the
|
||||
set and unset the "assume unchanged" bit for the
|
||||
paths. When the "assume unchanged" bit is on, git stops
|
||||
checking the working tree files for possible
|
||||
modifications, so you need to manually unset the bit to
|
||||
@ -122,7 +122,7 @@ you will need to handle the situation manually.
|
||||
'git-update-index' refuses an attempt to add `path/file`.
|
||||
Similarly if a file `path/file` exists, a file `path`
|
||||
cannot be added. With --replace flag, existing entries
|
||||
that conflicts with the entry being added are
|
||||
that conflict with the entry being added are
|
||||
automatically removed with warning messages.
|
||||
|
||||
--stdin::
|
||||
|
@ -999,8 +999,8 @@ Fast forward
|
||||
2 files changed, 2 insertions(+), 0 deletions(-)
|
||||
----------------
|
||||
|
||||
Because your branch did not contain anything more than what are
|
||||
already merged into the `master` branch, the merge operation did
|
||||
Because your branch did not contain anything more than what had
|
||||
already been merged into the `master` branch, the merge operation did
|
||||
not actually do a merge. Instead, it just updated the top of
|
||||
the tree of your branch to that of the `master` branch. This is
|
||||
often called 'fast forward' merge.
|
||||
@ -1353,7 +1353,7 @@ $ GIT_DIR=my-git.git git init
|
||||
------------
|
||||
|
||||
Make sure this directory is available for others you want your
|
||||
changes to be pulled by via the transport of your choice. Also
|
||||
changes to be pulled via the transport of your choice. Also
|
||||
you need to make sure that you have the 'git-receive-pack'
|
||||
program on the `$PATH`.
|
||||
|
||||
@ -1512,7 +1512,7 @@ You can repack this private repository whenever you feel like.
|
||||
6. Push your changes to the public repository, and announce it
|
||||
to the public.
|
||||
|
||||
7. Every once in a while, "git-repack" the public repository.
|
||||
7. Every once in a while, 'git-repack' the public repository.
|
||||
Go back to step 5. and continue working.
|
||||
|
||||
|
||||
|
@ -21,7 +21,7 @@ git repository.
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
To control which revisions to shown, the command takes options applicable to
|
||||
To control which revisions to show, the command takes options applicable to
|
||||
the 'git-rev-list' command (see linkgit:git-rev-list[1]).
|
||||
This manual page describes only the most
|
||||
frequently used options.
|
||||
@ -75,7 +75,7 @@ Examples
|
||||
--------
|
||||
gitk v2.6.12.. include/scsi drivers/scsi::
|
||||
|
||||
Show as the changes since version 'v2.6.12' that changed any
|
||||
Show the changes since version 'v2.6.12' that changed any
|
||||
file in the include/scsi or drivers/scsi subdirectories
|
||||
|
||||
gitk --since="2 weeks ago" \-- gitk::
|
||||
|
@ -7,11 +7,11 @@ At the core level, git is character encoding agnostic.
|
||||
to be what lstat(2) and creat(2) accepts. There is no such
|
||||
thing as pathname encoding translation.
|
||||
|
||||
- The contents of the blob objects are uninterpreted sequence
|
||||
- The contents of the blob objects are uninterpreted sequences
|
||||
of bytes. There is no encoding translation at the core
|
||||
level.
|
||||
|
||||
- The commit log messages are uninterpreted sequence of non-NUL
|
||||
- The commit log messages are uninterpreted sequences of non-NUL
|
||||
bytes.
|
||||
|
||||
Although we encourage that the commit log messages are encoded
|
||||
|
Loading…
Reference in New Issue
Block a user