From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Sep 2021, #04; Mon, 13)
Date: Mon, 13 Sep 2021 21:13:38 -0700 [thread overview]
Message-ID: <CABPp-BEC9_vuv0vEoPMVuk-p4Wyd8Me246GPT-qPAxgCaMpTQg@mail.gmail.com> (raw)
In-Reply-To: <xmqqtuinc3tx.fsf@gitster.g>
On Mon, Sep 13, 2021 at 7:06 PM Junio C Hamano <gitster@pobox.com> wrote:
> * en/remerge-diff (2021-08-31) 7 commits
> - doc/diff-options: explain the new --remerge-diff option
> - show, log: provide a --remerge-diff capability
> - tmp-objdir: new API for creating and removing primary object dirs
> - merge-ort: capture and print ll-merge warnings in our preferred fashion
> - ll-merge: add API for capturing warnings in a strbuf instead of stderr
> - merge-ort: add ability to record conflict messages in a file
> - merge-ort: mark a few more conflict messages as omittable
>
> A new presentation for two-parent merge "--remerge-diff" can be
> used to show the difference between mechanical (and possibly
> conflicted) merge results and the recorded resolution.
>
> What's the status of this one?
Same as last time[1]: tested in the wild, high level ideas probed by
you and I believe I answered them to your satisfaction, but only the
diff-merges part of the code got reviews.
[1] https://lore.kernel.org/git/CABPp-BGR3dfJE7TZ+jkjDdWyeXYowmJhtoFaQ8_Abn=ZROhB5Q@mail.gmail.com/
next prev parent reply other threads:[~2021-09-14 4:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 2:02 What's cooking in git.git (Sep 2021, #04; Mon, 13) Junio C Hamano
2021-09-14 4:13 ` Elijah Newren [this message]
2021-09-14 5:43 ` Taylor Blau
2021-09-14 13:33 ` Derrick Stolee
2021-09-14 17:47 ` Junio C Hamano
2021-09-14 19:47 ` Jeff Hostetler
2021-09-14 20:51 ` Junio C Hamano
2021-09-14 20:57 ` Jeff Hostetler
2021-09-14 19:54 ` Philip Oakley
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BEC9_vuv0vEoPMVuk-p4Wyd8Me246GPT-qPAxgCaMpTQg@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).