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 13:59:31 +0100 [thread overview]
Message-ID: <adf1fd3d0902050459s4fcb914ai2b9c8c04e9f72b02@mail.gmail.com> (raw)
In-Reply-To: <84B3CCAA-A044-4517-B2C8-14D5DD754FD2@manchester.ac.uk>
2009/2/5 Robert Haines <rhaines@manchester.ac.uk>:
> Hi all,
>
> I would like to use git-fmt-merge-msg to produce automatic summaries of what
> commits are being merged when I merge one branch into the other - like I see
> all the time in git.git, etc. The problem I am having is that I can only
> seem to get it to work with remote branches via .git/FETCH_HEAD - basically
> I don't know what else I can feed it to do what I want.
>
> Say I have a local repo with no remotes so no .git/FETCH_HEAD. Can I use
> git-fmt-merge-msg to produce such a summary when I'm just merging local
> branches? I've tried feeding just about everything I can find in .git/ into
> it but with no luck. Is there anything generated during the merge that can
> be used as input if I do a merge --no-commit? A list of merged commits or
> something?
>
> I'm sure I've missed something simple here...
Sure :-)
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.
HTH,
Santi
next prev parent reply other threads:[~2009-02-05 13:01 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 [this message]
2009-02-05 13:25 ` Robert Haines
2009-02-05 13:35 ` Santi Béjar
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=adf1fd3d0902050459s4fcb914ai2b9c8c04e9f72b02@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).