From: Denton Liu <liu.denton@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Feb 2019, #01; Tue, 5)
Date: Wed, 6 Feb 2019 01:39:00 -0800 [thread overview]
Message-ID: <20190206093900.GA20697@archbookpro.localdomain> (raw)
In-Reply-To: <xmqq1s4lst7m.fsf@gitster-ct.c.googlers.com>
On Tue, Feb 05, 2019 at 03:37:01PM -0800, Junio C Hamano wrote:
> * dl/merge-cleanup-scissors-fix (2019-01-27) 4 commits
> - merge: add scissors line on merge conflict
> - merge: cleanup messages like commit
> - t7600: clean up 'merge --squash c3 with c7' test
> - commit: extract cleanup_mode functions to sequencer
>
> The list of conflicted paths shown in the editor while concluding a
> conflicted merge was shown above the scissors line when the
> clean-up mode is set to "scissors", even though it was commented
> out just like the list of updated paths and other information to
> help the user explain the merge better.
>
> Will merge to 'next'.
We should pull v6[1] of the patchset before we merge into next. It
resolves merge conflicts related to the changed function signature of
`append_conflicts_hint`.
[1]: https://public-inbox.org/git/cover.1548219737.git.liu.denton@gmail.com/
next prev parent reply other threads:[~2019-02-06 9:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-05 23:37 What's cooking in git.git (Feb 2019, #01; Tue, 5) Junio C Hamano
2019-02-06 9:39 ` Denton Liu [this message]
2019-02-06 17:49 ` Junio C Hamano
2019-02-06 17:18 ` Jeff Hostetler
2019-02-06 17:49 ` Junio C Hamano
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=20190206093900.GA20697@archbookpro.localdomain \
--to=liu.denton@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).