From: Bradley Wagner <bradley.wagner@hannonhill.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: "Jeff King" <peff@peff.net>,
"Avery Pennarun" <apenwarr@gmail.com>,
"Ævar Arnfjörð" <avarab@gmail.com>,
git@vger.kernel.org, "Tay Ray Chuan" <rctay89@gmail.com>
Subject: Re: Possible feature request for merge and pull
Date: Thu, 29 Jul 2010 00:20:32 -0400 [thread overview]
Message-ID: <AANLkTimt7Q++tAjNc7iZSUTdtaYphg9=Dtmaco3HUJSc@mail.gmail.com> (raw)
In-Reply-To: <AANLkTinPcH-urWJJ_UELA5Kj=m3zKKLB8yGuvj6b03jw@mail.gmail.com>
On Wed, Jul 28, 2010 at 9:30 PM, Bradley Wagner
<bradley.wagner@hannonhill.com> wrote:
> On Wed, Jul 28, 2010 at 9:27 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
>> 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?
>
> Certainly am: git version 1.7.0
>
>> 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, I'll do that.
New version works great with merge. Thanks guys! Now I'm wondering if
we could bring -m flag to pull.
next prev parent reply other threads:[~2010-07-29 4:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-28 1:24 Possible feature request for merge and pull Bradley Wagner
2010-07-28 7:34 ` Ævar Arnfjörð Bjarmason
2010-07-28 20:49 ` Avery Pennarun
2010-07-28 20:55 ` Bradley Wagner
2010-07-29 1:03 ` Jeff King
2010-07-29 1:21 ` Bradley Wagner
2010-07-29 1:27 ` Jonathan Nieder
2010-07-29 1:30 ` Bradley Wagner
2010-07-29 4:20 ` Bradley Wagner [this message]
2010-07-29 4:22 ` Avery Pennarun
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='AANLkTimt7Q++tAjNc7iZSUTdtaYphg9=Dtmaco3HUJSc@mail.gmail.com' \
--to=bradley.wagner@hannonhill.com \
--cc=apenwarr@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=rctay89@gmail.com \
/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).