From: Jacob Keller <jacob.kel...@gmail.com> This series adds a default merge strategy option for git-notes, so that the user does not have to type "-s" every time. It is overridden by the -s option.
I also added some tests to ensure that the "--abort" "--commit" and "-s" options must be independent. In addition, I found a small documentation bug which is corrected in the first patch of the series. I Cc'd a couple more people in this version of the patch in order to hopefully get some more review. This is based on pu incase there were any other conflicts, but I can easily rebase if necessary. 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 | 55 +++++++++++++++++++++++++---------- notes-merge.h | 16 +++++----- t/t3309-notes-merge-auto-resolve.sh | 29 ++++++++++++++++++ t/t3310-notes-merge-manual-resolve.sh | 12 ++++++++ 6 files changed, 119 insertions(+), 37 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
