git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Santi Béjar" <santi@agolina.net>
To: Robert Haines <rhaines@manchester.ac.uk>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: How to use git-fmt-merge-msg?
Date: Thu, 5 Feb 2009 14:35:57 +0100	[thread overview]
Message-ID: <adf1fd3d0902050535y631035b6lfc09e0982aefdfd7@mail.gmail.com> (raw)
In-Reply-To: <B22C0229-47F4-48EC-9C68-63696C7BB3F2@manchester.ac.uk>

2009/2/5 Robert Haines <rhaines@manchester.ac.uk>:
>
> On 5 Feb 2009, at 12:59, Santi Béjar wrote:
>

[...]

>>
>> Manpage of git merge:
>>      --log
>>          In addition to branch names, populate the log message with
>> one-line
>>          descriptions from the actual commits that are being merged.
>>
>> Manpage of git config:
>>      merge.log
>>          Whether to include summaries of merged commits in newly created
>>          merge commit messages. False by default.
>
> Aaaahhhh.... Time for me to upgrade. The version of git I am using (1.5.3.8)
> doesn't have merge --log. No wonder I couldn't find it!

In that version you can use --summary and merge.summary, but they are
now deprecated.

HTH,
Santi

      reply	other threads:[~2009-02-05 13:37 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-05 12:31 How to use git-fmt-merge-msg? Robert Haines
2009-02-05 12:59 ` Santi Béjar
2009-02-05 13:25   ` Robert Haines
2009-02-05 13:35     ` Santi Béjar [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=adf1fd3d0902050535y631035b6lfc09e0982aefdfd7@mail.gmail.com \
    --to=santi@agolina.net \
    --cc=git@vger.kernel.org \
    --cc=rhaines@manchester.ac.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).