From: Jacob Keller <jacob.kel...@gmail.com> This series incorporates the feedback from both Johan and Eric. In addition, I included an RFC implementing suggestion from Johan regarding per-ref merge strategies.
I split the tests for --merge/--commit/--strategy out into their own patch to help review and keep the "one commit = one change" logic. I am not certain the RFC is ready yet, but the first 3 patches (now based on next) should be ready to go. 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: add per-ref configuration of merge strategy Documentation/config.txt | 18 +++- Documentation/git-notes.txt | 23 ++++- builtin/notes.c | 167 ++++++++++++++++++++++++++++++---- notes-merge.h | 16 ++-- t/t3309-notes-merge-auto-resolve.sh | 79 ++++++++++++++++ t/t3310-notes-merge-manual-resolve.sh | 12 +++ 6 files changed, 288 insertions(+), 27 deletions(-) -- 2.5.0.482.gfcd5645 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
