From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 31 Aug 2015 22:39:05 +0000 (-0700)
Subject: Merge branch 'jk/notes-merge-config'
X-Git-Tag: v2.6.0-rc0~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5b6211aee1f042a6961ef8a6bd8286db51bfc513

Merge branch 'jk/notes-merge-config'

"git notes merge" can be told with "--strategy=<how>" option how to
automatically handle conflicts; this can now be configured by
setting notes.mergeStrategy configuration variable.

* jk/notes-merge-config:
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
---

5b6211aee1f042a6961ef8a6bd8286db51bfc513