[PATCH 0/2] add notes.merge configuration variable

From: Jacob Keller <jacob.keller@gmail.com>

This small series is a precursor to some thoughts I have for enabling easier notes collaboration. First, make it so that users can configure the default notes merge strategy. Mostly useful if you always want to use cat_sort_uniq.

I also found that the rewriteMode supports cat_sort_uniq but does not document this fact.

Jacob Keller (2):
  notes: document cat_sort_uniq rewriteMode
  notes: add notes.merge option to select default strategy

 Documentation/config.txt              | 11 ++++-
 Documentation/git-notes.txt           | 33 +++++++++------
 builtin/notes.c                       | 75 +++++++++++++++++++++++++----------
 notes-merge.h                         | 16 ++++----
 t/t3309-notes-merge-auto-resolve.sh   | 29 ++++++++++++++
 t/t3310-notes-merge-manual-resolve.sh | 12 ++++++
 6 files changed, 133 insertions(+), 43 deletions(-)