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 (Oct 2019, #06; Thu, 24)
Date: Tue, 29 Oct 2019 01:45:00 -0700 [thread overview]
Message-ID: <20191029084500.GA1579611@generichostname> (raw)
In-Reply-To: <xmqqd0emfzrv.fsf@gitster-ct.c.googlers.com>
Hi Junio,
Since you use these What's Cooking messages to generate your release
notes:
On Thu, Oct 24, 2019 at 03:01:08PM +0900, Junio C Hamano wrote:
> * dl/apply-3way-diff3 (2019-10-24) 5 commits
> (merged to 'next' on 2019-10-24 at 84e27d28b6)
> + apply: respect merge.conflictStyle in --3way
> + t4108: demonstrate bug in apply
> + t4108: use `test_config` instead of `git config`
> + t4108: remove git command upstream of pipe
> + t4108: replace create_file with test_write_lines
>
> "git apply --3way" learned to honor merge.conflictsStyle
s/conflictsStyle/conflictStyle/
Thanks,
Denton
> configuration variable, like merges would.
>
> Will cook in 'next'.
prev parent reply other threads:[~2019-10-29 8:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-24 6:01 What's cooking in git.git (Oct 2019, #06; Thu, 24) Junio C Hamano
2019-10-24 21:33 ` Elijah Newren
2019-10-24 23:09 ` brian m. carlson
2019-10-25 2:51 ` Junio C Hamano
2019-10-25 14:52 ` js/builtin-add-i, was " Johannes Schindelin
2019-10-29 8:45 ` Denton Liu [this message]
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=20191029084500.GA1579611@generichostname \
--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).