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 <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephen Boyd committed
May 4, 2009 at 22:18 UTC
3db964b551827e25f897cc75ffd8e520ee8b48cd
1 file changed
+6
-6
Documentation/git-am.txt
+6
-6
@@ -32,7 +32,7 @@ OPTIONS
32
33
-s::
34
--signoff::
35
- Add `Signed-off-by:` line to the commit message, using
35
+ Add a `Signed-off-by:` line to the commit message, using
36
the committer identity of yourself.
37
38
-k::
@@ -118,8 +118,8 @@ The commit author name is taken from the "From: " line of the
118
message, and commit author time is taken from the "Date: " line
119
of the message. The "Subject: " line is used as the title of
120
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.
123
124
The body of the message (the rest of the message after the blank line
125
that terminates the RFC2822 headers) can begin with "Subject: " and
@@ -128,8 +128,8 @@ to override the values of these fields.
128
129
The commit message is formed by the title taken from the
130
"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.
133
134
The patch is expected to be inline, directly following the
135
message. Any line that is of the form:
@@ -141,7 +141,7 @@ message. Any line that is of the form:
141
is taken as the beginning of a patch, and the commit log message
142
is terminated before the first occurrence of such a line.
143
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
145
to process. Upon seeing the first patch that does not apply, it
146
aborts in the middle. You can recover from this in one of two ways:
147