Skip to content

Commit 3db964b

Browse files
bebarinogitster
authored andcommitted
git-am.txt: add an 'a', say what 'it' is, simplify a sentence
It's nice to know that 'it' is git-am or the subject line. Whitespace implies characters so just remove characters. Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a48f5d7 commit 3db964b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Documentation/git-am.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ OPTIONS
3232

3333
-s::
3434
--signoff::
35-
Add `Signed-off-by:` line to the commit message, using
35+
Add a `Signed-off-by:` line to the commit message, using
3636
the committer identity of yourself.
3737

3838
-k::
@@ -118,8 +118,8 @@ The commit author name is taken from the "From: " line of the
118118
message, and commit author time is taken from the "Date: " line
119119
of the message. The "Subject: " line is used as the title of
120120
the commit, after stripping common prefix "[PATCH <anything>]".
121-
It is supposed to describe what the commit is about concisely as
122-
a one line text.
121+
The "Subject: " line is supposed to concisely describe what the
122+
commit is about in one line of text.
123123

124124
The body of the message (the rest of the message after the blank line
125125
that terminates the RFC2822 headers) can begin with "Subject: " and
@@ -128,8 +128,8 @@ to override the values of these fields.
128128

129129
The commit message is formed by the title taken from the
130130
"Subject: ", a blank line and the body of the message up to
131-
where the patch begins. Excess whitespace characters at the end of the
132-
lines are automatically stripped.
131+
where the patch begins. Excess whitespace at the end of each
132+
line is automatically stripped.
133133

134134
The patch is expected to be inline, directly following the
135135
message. Any line that is of the form:
@@ -141,7 +141,7 @@ message. Any line that is of the form:
141141
is taken as the beginning of a patch, and the commit log message
142142
is terminated before the first occurrence of such a line.
143143

144-
When initially invoking it, you give it the names of the mailboxes
144+
When initially invoking `git am`, you give it the names of the mailboxes
145145
to process. Upon seeing the first patch that does not apply, it
146146
aborts in the middle. You can recover from this in one of two ways:
147147

0 commit comments

Comments
 (0)