git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Possible feature request for merge and pull

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Jul 29, 2010, 01:27 UTC
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

Previous: Bradley WagnerNext: Bradley Wagner
Message 7 of 10 in “Possible feature request for merge and pull”
  1. Bradley WagnerJul 28, 2010
  2. Ævar Arnfjörð BjarmasonJul 28, 2010
  3. Avery PennarunJul 28, 2010
  4. Bradley WagnerJul 28, 2010
  5. Jeff KingJul 29, 2010
  6. Bradley WagnerJul 29, 2010
  7. Jonathan NiederJul 29, 2010
  8. Bradley WagnerJul 29, 2010
  9. Bradley WagnerJul 29, 2010
  10. Avery PennarunJul 29, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.