summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-08 12:44:12 -0800
committerJunio C Hamano <gitster@pobox.com>2020-01-08 12:44:12 -0800
commit202f68b252d3d4bcd6d02c0c135dc64e35348679 (patch)
treeaef078d707605621832fc554cefecb1e227dfe21
parent7e65f8638e5bfe439fa12a4fb677b24ed63ed753 (diff)
parentf8740c586b2d39565a3f484debfa6d075f2ce5a0 (diff)
downloadgit-202f68b252d3d4bcd6d02c0c135dc64e35348679.tar.gz
Merge branch 'pm/am-in-body-header-doc-update'
Doc update. * pm/am-in-body-header-doc-update: am: document that Date: can appear as an in-body header
-rw-r--r--Documentation/git-am.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index fc5750b3b8..11ca61b00b 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -190,8 +190,8 @@ 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.
-"From: " and "Subject: " lines starting the body override the respective
-commit author name and title values taken from the headers.
+"From: ", "Date: ", and "Subject: " lines starting the body 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