git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: "G. Sylvie Davies" <sylvie@bit-booster.com>,
	Jeff King <peff@peff.net>,
	Michael Spiegel <michael.m.spiegel@gmail.com>,
	git@vger.kernel.org
Subject: Re: show all merge conflicts
Date: Mon, 27 Feb 2017 11:45:31 -0800	[thread overview]
Message-ID: <xmqqr32jwh7o.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <6ff25254-720e-5b85-ba6d-22b16e91b354@drmicha.warpmail.net> (Michael J. Gruber's message of "Mon, 27 Feb 2017 15:28:32 +0100")

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?

  reply	other threads:[~2017-02-27 19:54 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-27 16:56 show all merge conflicts Michael Spiegel
2017-01-27 17:51 ` Jeff King
2017-01-28  5:42   ` G. Sylvie Davies
2017-01-28 13:43     ` Philip Oakley
2017-01-28 14:28     ` Jeff King
2017-01-29  6:45       ` G. Sylvie Davies
2017-02-27 14:28         ` Michael J Gruber
2017-02-27 19:45           ` Junio C Hamano [this message]
2017-02-27 20:45             ` Jeff King

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqr32jwh7o.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=michael.m.spiegel@gmail.com \
    --cc=peff@peff.net \
    --cc=sylvie@bit-booster.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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).