Re: [PATCH 2/2] notes: add notes.merge option to select default strategy

2015-07-31 Thread Eric Sunshine
On Fri, Jul 31, 2015 at 3:21 PM, Jacob Keller wrote: > Teach git-notes about a new configuration option "notes.merge" for > selecting the default notes merge strategy. Document the option in > config.txt and git-notes.txt > > Add tests for the configuration option. Ensure that command line > --str

[PATCH 2/2] notes: add notes.merge option to select default strategy

2015-07-31 Thread Jacob Keller
From: Jacob Keller Teach git-notes about a new configuration option "notes.merge" for selecting the default notes merge strategy. Document the option in config.txt and git-notes.txt Add tests for the configuration option. Ensure that command line --strategy option overrides the configured value.