From: Jeff King <peff@peff.net>
Date: Thu, 29 Jul 2010 01:03:41 GMT
Subject: Re: Possible feature request for merge and pull
Message-ID: <20100729010341.GA25732@coredump.intra.peff.net>
In-Reply-To: <AANLkTikA2jWu76aPUNG+B7Nwc9eDzoU93VcGvUFWR0Ri@mail.gmail.com>

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