Re: [PATCH 0/2] add notes.merge configuration variable
CC'ing yourself is ok, but please do not forget to ask reviews from people who have touched the area of the code you are touching (they are hopefully the ones who are more knowledgeable and can help you). Old timers like I know Johan is the go-to person on things around notes, but new people can ask their copy of Git: $ git shortlog -n -s --no-merges master builtin/notes.c notes.c | head -n 5 46 Johan Herland 11 Junio C Hamano 11 Michael Haggerty 5 Jeff King 5 Nguyễn Thái Ngọc Duy The changes to the code looked reasonable from a cursory read, though. Thanks. -- 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
[PATCH 0/2] add notes.merge configuration variable
From: Jacob Keller This small series is a precursor to some thoughts I have for enabling easier notes collaboration. First, make it so that users can configure the default notes merge strategy. Mostly useful if you always want to use cat_sort_uniq. I also found that the rewriteMode supports cat_sort_uniq but does not document this fact. 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 | 75 +-- notes-merge.h | 16 t/t3309-notes-merge-auto-resolve.sh | 29 ++ t/t3310-notes-merge-manual-resolve.sh | 12 ++ 6 files changed, 133 insertions(+), 43 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
