From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 29 Jul 2010 01:27:23 GMT
Subject: Re: Possible feature request for merge and pull
Message-ID: <20100729012723.GH29156@dert.cs.uchicago.edu>
In-Reply-To: <AANLkTikP+5GxyWbXNcKeOtQoOEGAT9v313jAum+q-1LV@mail.gmail.com>

Bradley Wagner wrote:
> On Wed, Jul 28, 2010 at 9:03 PM, Jeff King <peff@peff.net> wrote:

>> Really? I get:
[...]
> --log is supposed to include one-log summaries of each of the merged
> commits, right? It's not doing that for me

Just a wild guess, but are you using a version of git before
1.7.1.1?

If you upgrade, you'll be able to use -m with --log for
"git merge", at least (v1.7.1.1~23^2: merge: --log appends
shortlog to message if specified, 2010-05-11).

Thanks, Tay!
Jonathan