Re: [PATCH] have merge put FETCH_HEAD data in commit message

From

Junio C Hamano <junkio@cox.net>

Date

Mar 22, 2007, 10:31 UTC

Message-ID

<7vr6rhtvr0.fsf@assigned-by-dhcp.cox.net>

In-Reply-To

<20070322083757.GC29341@mellanox.co.il>

"Michael S. Tsirkin" <mst@dev.mellanox.co.il> writes:

> Specifically, as far as a *user* is concerned:
> 1. the fact that "---" separates commit message from patch, and
>    that text after "---" is ignored seems to be undocumented
> 2. the fact that message subject is appended to the log,
>    the rules for removing [PATCH] etc from subject seem to be undocumented
> 3. if I want to have some text coming *before* the commit
>    message ignored, there's no way to do this
> 4. there's no way to override the subject from within the message
>    (like there is with author/From line)

---

 Documentation/git-am.txt |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 13a7389..148ce40 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -87,6 +87,33 @@ default.   You could use `--no-utf8` to override this.
 DISCUSSION
 ----------
 
+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>]".
+It is supposed to describe what the commit is about concisely as
+a one line text.
+
+The body of the message (iow, after a blank line that terminates
+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.
+
+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 whitespaces at the end of the
+lines are automatically stripped.
+
+The patch is expected to be inline, directly following the
+message.  Any line that is of form:
+
+* three-dashes and end-of-line, or
+* a line that begins with "diff -", or
+* a line that begins with "Index: "
+
+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 names of the mailboxes
 to crunch.  Upon seeing the first patch that does not apply, it
 aborts in the middle, just like 'git-applymbox' does.  You can