Re: What's cooking in git.git (Aug 2015, #04; Tue, 25)

Jacob Keller [off-list ref] writes:

On Tue, Aug 25, 2015 at 4:28 PM, Junio C Hamano [off-list ref] wrote:

quoted

* 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.