From: Junio C Hamano <gitster@pobox.com>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Aug 2015, #04; Tue, 25)
Date: Wed, 26 Aug 2015 09:21:38 -0700 [thread overview]
Message-ID: <xmqqfv36uijx.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CA+P7+xph-EtxL1sB71uF5qH=VmTM1YwZF9+Y3ez0-VmpWWjytw@mail.gmail.com> (Jacob Keller's message of "Tue, 25 Aug 2015 16:38:09 -0700")
Jacob Keller <jacob.keller@gmail.com> writes:
> On Tue, Aug 25, 2015 at 4:28 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> * jk/notes-merge-config (2015-08-17) 6 commits
>> - notes: teach git-notes about notes.<name>.mergeStrategy option
>> - notes: add notes.mergeStrategy option to select default strategy
>> - notes: add tests for --commit/--abort/--strategy exclusivity
>> - notes: extract parse_notes_merge_strategy to notes-utils
>> - notes: extract enum notes_merge_strategy to notes-utils.h
>> - notes: document cat_sort_uniq rewriteMode
>>
>> "git notes merge" can be told with "--strategy=<how>" option how to
>> automatically handle conflicts; this can now be configured by
>> setting notes.merge configuration variable.
>>
>> I think this is ready for 'next', but did I miss comments that need
>> to be addressed before it happens?
>
> I believe I got all the comments fixed in the most recent series. I
> was not aware of any other comments so if someone has them letting me
> know would be helpful as I had no plans to re-roll anything at
> present.
Thanks.
prev parent reply other threads:[~2015-08-26 16:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-25 23:28 What's cooking in git.git (Aug 2015, #04; Tue, 25) Junio C Hamano
2015-08-25 23:38 ` Jacob Keller
2015-08-26 16:21 ` Junio C Hamano [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=xmqqfv36uijx.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.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