Skip to content

Commit 04c8ce9

Browse files
marcowsgitster
authored andcommitted
Documentation: fix typos, grammar, asciidoc syntax
Signed-off-by: Markus Heidelberg <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 87c8a56 commit 04c8ce9

13 files changed

+25
-25
lines changed

Documentation/diff-format.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Possible status letters are:
5858
be committed)
5959
- X: "unknown" change type (most probably a bug, please report it)
6060

61-
Status letters C and M are always followed by a score (denoting the
61+
Status letters C and R are always followed by a score (denoting the
6262
percentage of similarity between the source and target of the move or
6363
copy), and are the only ones to be so.
6464

Documentation/diff-generate-patch.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,15 @@ different from it.
143143

144144
A `-` character in the column N means that the line appears in
145145
fileN but it does not appear in the result. A `+` character
146-
in the column N means that the line appears in the last file,
146+
in the column N means that the line appears in the result,
147147
and fileN does not have that line (in other words, the line was
148148
added, from the point of view of that parent).
149149

150150
In the above example output, the function signature was changed
151151
from both files (hence two `-` removals from both file1 and
152152
file2, plus `++` to mean one line that was added does not appear
153-
in either file1 nor file2). Also two other lines are the same
154-
from file1 but do not appear in file2 (hence prefixed with ` +`).
153+
in either file1 nor file2). Also eight other lines are the same
154+
from file1 but do not appear in file2 (hence prefixed with `{plus}`).
155155

156156
When shown by `git diff-tree -c`, it compares the parents of a
157157
merge commit with the merge result (i.e. file1..fileN are the

Documentation/git-commit.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ but can be used to amend a merge commit.
159159
'git-commit' if any paths are given on the command line,
160160
in which case this option can be omitted.
161161
If this option is specified together with '--amend', then
162-
no paths need be specified, which can be used to amend
162+
no paths need to be specified, which can be used to amend
163163
the last commit without committing changes that have
164164
already been staged.
165165

Documentation/git-diff-tree.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ include::diff-options.txt[]
4343
show tree entry itself as well as subtrees. Implies -r.
4444

4545
--root::
46-
When '--root' is specified the initial commit will be showed as a big
46+
When '--root' is specified the initial commit will be shown as a big
4747
creation event. This is equivalent to a diff against the NULL tree.
4848

4949
--stdin::

Documentation/git-mailinfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SYNOPSIS
1313

1414
DESCRIPTION
1515
-----------
16-
Reading a single e-mail message from the standard input, and
16+
Reads a single e-mail message from the standard input, and
1717
writes the commit log message in <msg> file, and the patches in
1818
<patch> file. The author name, e-mail and e-mail subject are
1919
written out to the standard output to be used by 'git-am'

Documentation/git-receive-pack.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ post-receive Hook
8686
-----------------
8787
After all refs were updated (or attempted to be updated), if any
8888
ref update was successful, and if $GIT_DIR/hooks/post-receive
89-
file exists and is executable, it will be invoke once with no
89+
file exists and is executable, it will be invoked once with no
9090
parameters. The standard input of the hook will be one line
9191
for each successfully updated ref:
9292

@@ -133,7 +133,7 @@ post-update Hook
133133
----------------
134134
After all other processing, if at least one ref was updated, and
135135
if $GIT_DIR/hooks/post-update file exists and is executable, then
136-
post-update will called with the list of refs that have been updated.
136+
post-update will be called with the list of refs that have been updated.
137137
This can be used to implement any repository wide cleanup tasks.
138138

139139
The exit code from this hook invocation is ignored; the only thing

Documentation/git-reflog.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ updated. This command is to manage the information recorded in it.
2828

2929
The subcommand "expire" is used to prune older reflog entries.
3030
Entries older than `expire` time, or entries older than
31-
`expire-unreachable` time and are not reachable from the current
31+
`expire-unreachable` time and not reachable from the current
3232
tip, are removed from the reflog. This is typically not used
3333
directly by the end users -- instead, see linkgit:git-gc[1].
3434

@@ -71,7 +71,7 @@ them.
7171
which in turn defaults to 90 days.
7272

7373
--expire-unreachable=<time>::
74-
Entries older than this time and are not reachable from
74+
Entries older than this time and not reachable from
7575
the current tip of the branch are pruned. Without the
7676
option it is taken from configuration
7777
`gc.reflogExpireUnreachable`, which in turn defaults to

Documentation/git-show-branch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ OPTIONS
3030
-------
3131
<rev>::
3232
Arbitrary extended SHA1 expression (see linkgit:git-rev-parse[1])
33-
that typically names a branch HEAD or a tag.
33+
that typically names a branch head or a tag.
3434

3535
<glob>::
3636
A glob pattern that matches branch or tag names under

Documentation/git-submodule.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ use by subsequent users cloning the superproject. If the URL is
8585
given relative to the superproject's repository, the presumption
8686
is the superproject and submodule repositories will be kept
8787
together in the same relative location, and only the
88-
superproject's URL need be provided: git-submodule will correctly
88+
superproject's URL needs to be provided: git-submodule will correctly
8989
locate the submodule using the relative URL in .gitmodules.
9090

9191
status::

Documentation/git-update-index.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ OPTIONS
5555
default behavior is to error out. This option makes
5656
'git-update-index' continue anyway.
5757

58-
--ignore-submodules:
58+
--ignore-submodules::
5959
Do not try to update submodules. This option is only respected
6060
when passed before --refresh.
6161

@@ -78,9 +78,9 @@ OPTIONS
7878

7979
--assume-unchanged::
8080
--no-assume-unchanged::
81-
When these flags are specified, the object name recorded
81+
When these flags are specified, the object names recorded
8282
for the paths are not updated. Instead, these options
83-
sets and unsets the "assume unchanged" bit for the
83+
set and unset the "assume unchanged" bit for the
8484
paths. When the "assume unchanged" bit is on, git stops
8585
checking the working tree files for possible
8686
modifications, so you need to manually unset the bit to
@@ -122,7 +122,7 @@ you will need to handle the situation manually.
122122
'git-update-index' refuses an attempt to add `path/file`.
123123
Similarly if a file `path/file` exists, a file `path`
124124
cannot be added. With --replace flag, existing entries
125-
that conflicts with the entry being added are
125+
that conflict with the entry being added are
126126
automatically removed with warning messages.
127127

128128
--stdin::

0 commit comments

Comments
 (0)