[PATCH v4 0/4] add notes strategy configuration options

[Jacob Keller <jacob.e.keller@intel.com>]

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

This series of patches implements notes.merge and notes.<ref>.merge
options for configuring notes merge strategy such that user may avoid
typing "-s". It is (probably) most useful if the user wishes to always
enforce cat_sort_uniq strategy.

This series now uses git_config_get_string_const() instead of trying to
change the git_default_config setup. In addition, the 4th patch is much
smaller and avoids a lot of heavy cruft due to this change.

I tried to re-work everything I noticed from the email list, but please
shout if I did not manage to recall your suggestion.

The new version should be much simpler to understand.

Changes since v3:
* don't use hash table, instead just call "git_config_get_string_const"
* notes.<ref>.merge must always be fully qualified, (since notes doesn't
  enforce the refs to be always in refs/notes, so we shouldn't either)
* fixed documentation to reduce confusion over which strategies are
  accepted for options
* ensure tests cover "notes.<ref>.merge" overrides "notes.merge"

I also tried to make sure the reviewers were all Cc'ed on every patch
not just the first one this time.

Jacob Keller (4):
  notes: document cat_sort_uniq rewriteMode
  notes: add tests for --commit/--abort/--strategy exclusivity
  notes: add notes.merge option to select default strategy
  notes: teach git-notes about notes.<ref>.merge option

 Documentation/config.txt              | 17 +++++++--
 Documentation/git-notes.txt           | 23 ++++++++++--
 builtin/notes.c                       | 49 ++++++++++++++++---------
 notes-merge.h                         | 16 +++++----
 t/t3309-notes-merge-auto-resolve.sh   | 68 +++++++++++++++++++++++++++++++++++
 t/t3310-notes-merge-manual-resolve.sh | 12 +++++++
 6 files changed, 157 insertions(+), 28 deletions(-)

-- 
2.5.0.482.gfcd5645