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

Re: show all merge conflicts

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 27, 2017, 19:45 UTC
Message-ID
<xmqqr32jwh7o.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<6ff25254-720e-5b85-ba6d-22b16e91b354@drmicha.warpmail.net>
Michael J Gruber <git@drmicha.warpmail.net> writes:
> If you're curious, I kept rebasing Thomas' remerge-diff (on top of our
> next) so far. You can find it at
>
> https://github.com/mjg/git/tree/remerge-diff

;-). Yes, this was a good one. 

> if you're interested. I don't know what problems were found back then,
> or what it would take to get this in-tree now.

If I recall correctly, everybody was in favor of what it does (or at least attempted to do), but was leaky and not ready for "log -p" to be used on a long stretch of history or something?

Previous: Michael J GruberNext: Jeff King
Message 8 of 9 in “show all merge conflicts”
  1. Michael SpiegelJan 27, 2017
  2. Jeff KingJan 27, 2017
  3. G. Sylvie DaviesJan 28, 2017
  4. Philip OakleyJan 28, 2017
  5. Jeff KingJan 28, 2017
  6. G. Sylvie DaviesJan 29, 2017
  7. Michael J GruberFeb 27, 2017
  8. Junio C HamanoFeb 27, 2017
  9. Jeff KingFeb 27, 2017

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.