From: Jacob Keller Date: Fri, 14 Aug 2015 20:48:45 GMT Subject: [PATCH v6 0/4] notes.mergestrategy config option Message-ID: <1439585329-10542-1-git-send-email-jacob.e.keller@intel.com> From: Jacob Keller Changes since v6: * use a static git_config_get_notes_strategy function * use git_die_config to display useful information about which configuration failed. This should address Eric's concern. It also makes it so that we don't even read the configuration at all unless we need to. 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..mergestrategy option Documentation/config.txt | 18 ++++++++-- Documentation/git-notes.txt | 23 ++++++++++-- builtin/notes.c | 60 ++++++++++++++++++++++++------- notes-merge.h | 16 +++++---- t/t3309-notes-merge-auto-resolve.sh | 68 +++++++++++++++++++++++++++++++++++ t/t3310-notes-merge-manual-resolve.sh | 12 +++++++ 6 files changed, 173 insertions(+), 24 deletions(-) -- 2.5.0.280.g4aaba03