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
Junio C Hamano <gitster@pobox.com>
Date
Jun 25, 2007, 07:50 UTC
Message-ID
<7vk5ts1ni4.fsf@assigned-by-dhcp.pobox.com>
In-Reply-To
<20070625071624.7919.qmail@82fa8ed4561cac.315fe32.mid.smarden.org>
Gerrit Pape <pape@smarden.org> writes:
Show 9 quoted lines
> If a strategy module auto resolved the merge cleanly, record the used
> strategy in the log message, e.g.:
>
>   Merge branch 'maint' using strategy ours
>
> Signed-off-by: Gerrit Pape <pape@smarden.org>
> ---
>
>> I personally find this useful especially for the 'ours' strategy.

I really do not think we want to do this, especially when the user did not specify anything unusual like "ours".

At least, exclude recursive and octopus out of it, please.
Previous: Gerrit PapeNext: Johannes Schindelin
Message 2 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.