Re: Possible feature request for merge and pull

From: Avery Pennarun <apenwarr@gmail.com>
Date: Jul 28, 2010, 20:49 UTC
Message-ID: <AANLkTikA2jWu76aPUNG+B7Nwc9eDzoU93VcGvUFWR0Ri@mail.gmail.com>
In-Reply-To: <AANLkTinRvq71GS5WVdWs9zP5QSJ=TjCWBgTfRGn2Qub0@mail.gmail.com>

On Wed, Jul 28, 2010 at 3:34 AM, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

Show 14 quoted lines

> On Wed, Jul 28, 2010 at 01:24, Bradley Wagner
> <bradley.wagner@hannonhill.com> wrote:
>> I would love to be able to use the -m flag and --log together with git
>> merge and pull to be able to create a custom commit message but also
>> include one-line summaries of each of the commits being merged/pulled.
>
> This sort of thing has vaguely come up before, and it was mentioned
> that you can just use a small script that calls git-filter-branch or
> git-rebase -i.
>
> It's easy to rewrite the commits you just pulled, having some feature
> that e.g. adds a custom message to the beginning of each of them would
> just impose an artificial limitation and overlap with existing (and
> more powerful) functionality.

If I understand correctly, the request is not to rewrite the pulled commits, but just to produce a nice message in the newly-created merge commit.

It sounds like --log and -m are currently incompatible, in that -m overrides --log, and that's not the desired behaviour. Bradley: this is probably a relatively easy fix to make, in case you're looking to get into some git hacking. :)

Have fun,

Avery