Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-am.txt: add an 'a', say what 'it' is, simplify a sentence
author
Stephen Boyd
<bebarino@gmail.com>
Tue, 5 May 2009 05:18:42 +0000
(22:18 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 6 May 2009 05:08:58 +0000
(22:08 -0700)
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>
Documentation/git-am.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
a48f5d7
)
diff --git
a/Documentation/git-am.txt
b/Documentation/git-am.txt
index 1e71dd536b1881b61a007af09f1dedea37fe984e..a497010ae62d6b28298aa32e82af7af74e2076e6 100644
(file)
--- a/
Documentation/git-am.txt
+++ b/
Documentation/git-am.txt
@@
-32,7
+32,7
@@
OPTIONS
-s::
--signoff::
-s::
--signoff::
- Add `Signed-off-by:` line to the commit message, using
+ Add
a
`Signed-off-by:` line to the commit message, using
the committer identity of yourself.
-k::
the committer identity of yourself.
-k::
@@
-118,8
+118,8
@@
The commit author name is taken from the "From: " line of the
message, and commit author time is taken from the "Date: " line
of the message. The "Subject: " line is used as the title of
the commit, after stripping common prefix "[PATCH <anything>]".
message, and commit author time is taken from the "Date: " line
of the message. The "Subject: " line is used as the title of
the commit, after stripping common prefix "[PATCH <anything>]".
-It is supposed to describe what the commit is about concisely as
-
a one line
text.
+The "Subject: " line is supposed to concisely describe what the
+
commit is about in one line of
text.
The body of the message (the rest of the message after the blank line
that terminates the RFC2822 headers) can begin with "Subject: " and
The body of the message (the rest of the message after the blank line
that terminates the RFC2822 headers) can begin with "Subject: " and
@@
-128,8
+128,8
@@
to override the values of these fields.
The commit message is formed by the title taken from the
"Subject: ", a blank line and the body of the message up to
The commit message is formed by the title taken from the
"Subject: ", a blank line and the body of the message up to
-where the patch begins. Excess whitespace
characters at the end of the
-line
s are
automatically stripped.
+where the patch begins. Excess whitespace
at the end of each
+line
is
automatically stripped.
The patch is expected to be inline, directly following the
message. Any line that is of the form:
The patch is expected to be inline, directly following the
message. Any line that is of the form:
@@
-141,7
+141,7
@@
message. Any line that is of the form:
is taken as the beginning of a patch, and the commit log message
is terminated before the first occurrence of such a line.
is taken as the beginning of a patch, and the commit log message
is terminated before the first occurrence of such a line.
-When initially invoking
it
, you give it the names of the mailboxes
+When initially invoking
`git am`
, you give it the names of the mailboxes
to process. Upon seeing the first patch that does not apply, it
aborts in the middle. You can recover from this in one of two ways:
to process. Upon seeing the first patch that does not apply, it
aborts in the middle. You can recover from this in one of two ways: