summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-05-04 06:46:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-06 05:09:31 (GMT)
commit7713e053fd13a09b548cb65d99dfca986064955e (patch)
tree1367338cf7716d8a50deb6a4f7b89d025605d4c8 /Documentation/git-am.txt
parente77063fccb4c1627bd4656a42a508391d16e7482 (diff)
downloadgit-7713e053fd13a09b548cb65d99dfca986064955e.zip
git-7713e053fd13a09b548cb65d99dfca986064955e.tar.gz
git-7713e053fd13a09b548cb65d99dfca986064955e.tar.bz2
git-am.txt: reword extra headers in message body
Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index ea84cbb..6d92cbe 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -121,10 +121,10 @@ the commit, after stripping common prefix "[PATCH <anything>]".
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
-"From: " lines that are different from those of the mail header,
-to override the values of these fields.
+"From: " and "Subject: " lines starting the body (the rest of the
+message after the blank line terminating the RFC2822 headers)
+override the respective commit author name and title values taken
+from the headers.
The commit message is formed by the title taken from the
"Subject: ", a blank line and the body of the message up to