From: Jacob Keller <jacob.e.keller@intel.com>
Date: Fri, 14 Aug 2015 21:13:51 GMT
Subject: [PATCH v7 0/4] notes.mergestrategy option(s)
Message-ID: <1439586835-15712-1-git-send-email-jacob.e.keller@intel.com>

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

Changes since v6
* Eric suggested a more stream-lined approach for
  git_config_get_notes_strategy

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

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

-- 
2.5.0.280.g4aaba03