git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Bradley Wagner <bradley.wagner@hannonhill.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: Wed, 28 Jul 2010 20:27:23 -0500	[thread overview]
Message-ID: <20100729012723.GH29156@dert.cs.uchicago.edu> (raw)
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

  reply	other threads:[~2010-07-29  1:27 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 [this message]
2010-07-29  1:30           ` Bradley Wagner
2010-07-29  4:20             ` Bradley Wagner
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=20100729012723.GH29156@dert.cs.uchicago.edu \
    --to=jrnieder@gmail.com \
    --cc=apenwarr@gmail.com \
    --cc=avarab@gmail.com \
    --cc=bradley.wagner@hannonhill.com \
    --cc=git@vger.kernel.org \
    --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).