Re: [PATCH 0/2] add notes.merge configuration variable

2015-07-31 Thread Junio C Hamano
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 a

[PATCH 0/2] add notes.merge configuration variable

2015-07-31 Thread Jacob Keller
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_