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

Re: [PATCH] git-merge: record merge strategy in the log message on auto resolved merges

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 25, 2007, 07:53 UTC
Message-ID
<Pine.LNX.4.64.0706250852470.4059@racer.site>
In-Reply-To
<20070625071624.7919.qmail@82fa8ed4561cac.315fe32.mid.smarden.org>
Hi,
On Mon, 25 Jun 2007, Gerrit Pape wrote:
> If a strategy module auto resolved the merge cleanly, record the used
> strategy in the log message

Why only when it merged cleanly? If that information is useful, it is _especially_ useful when you had conflicts, so that you know how to recreate the merge?

Ciao, Dscho

Previous: Junio C Hamano
Message 3 of 3 in “git-merge: record merge strategy in the log message on auto resolved merges”
  1. git-merge: record merge strategy in the log message on auto resolved mergesGerrit Pape, Jun 25, 2007
  2. Junio C HamanoJun 25, 2007
  3. Johannes SchindelinJun 25, 2007

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.