Re: [PATCH v2 0/2] notes: add notes.merge strategy option

On Sat, Aug 1, 2015 at 1:12 AM, Jacob Keller wrote: > From: Jacob Keller > > 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 like this addition. A natural extension (i.e. future work,

[PATCH v2 0/2] notes: add notes.merge strategy option

From: Jacob Keller 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