From: Bradley Wagner <bradley.wagner@hannonhill.com>
Date: Thu, 29 Jul 2010 01:21:21 GMT
Subject: Re: Possible feature request for merge and pull
Message-ID: <AANLkTikP+5GxyWbXNcKeOtQoOEGAT9v313jAum+q-1LV@mail.gmail.com>
In-Reply-To: <20100729010341.GA25732@coredump.intra.peff.net>

On Wed, Jul 28, 2010 at 9:03 PM, Jeff King <peff@peff.net> wrote:
> On Wed, Jul 28, 2010 at 04:49:11PM -0400, Avery Pennarun wrote:
>
>> 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. :)
>
> Really? I get:
>
>  $ mkdir repo && cd repo && git init &&
>    echo content >file && git add file && git commit -m one &&
>    echo content >>file && git commit -a -m two &&
>    git checkout -b other HEAD^ &&
>    echo content >file2 && git add file2 && git commit -m three &&
>    git merge --log -m "custom message" master &&
>    git show
>
>  commit fa21035ea5f5437e8664a5d249e7ab88ee3f0e75
>  Merge: d12be4a 4dc5cba
>  Author: Jeff King <peff@peff.net>
>  Date:   Wed Jul 28 20:50:39 2010 -0400
>
>      custom message
>
>      * master:
>        two
>
> which seems to be what was asked for. So is the problem just that
> git-pull does not take "-m"?
>
> -Peff
>

--log is supposed to include one-log summaries of each of the merged
commits, right? It's not doing that for me when when I do 'git merge
--log -m "message" <branch>'. Instead, it's only using the message I
specified with -m.

One difference is that I'm merging topic branch into master but that
shouldn't make any difference.

Your right that the other part of the request is to add -m to pull.