On Fri, Aug 14, 2015 at 11:13 PM, Jacob Keller <jacob.e.keller@xxxxxxxxx> wrote: > From: Jacob Keller <jacob.keller@xxxxxxxxx> > > Add new option "notes.<ref>.mergestrategy" option which specifies the merge > strategy for merging into a given notes ref. This option enables > selection of merge strategy for particular notes refs, rather than all > notes ref merges, as user may not want cat_sort_uniq for all refs, but > only some. Note that the <ref> is the local reference we are merging > into, not the remote ref we merged from. The assumption is that users > will mostly want to configure separate local ref merge strategies rather > than strategies depending on which remote ref they merge from. Also, > notes.<ref>.merge overrides the general behavior as it is more specific. > > Signed-off-by: Jacob Keller <jacob.keller@xxxxxxxxx> > --- > Documentation/config.txt | 7 +++++++ > Documentation/git-notes.txt | 6 ++++++ > builtin/notes.c | 13 ++++++++++--- > t/t3309-notes-merge-auto-resolve.sh | 39 +++++++++++++++++++++++++++++++++++++ > 4 files changed, 62 insertions(+), 3 deletions(-) > > diff --git a/Documentation/config.txt b/Documentation/config.txt > index 5e3e03459de7..47478311367e 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -1926,6 +1926,13 @@ notes.mergestrategy:: > STRATEGIES" section of linkgit:git-notes[1] for more information > on each strategy. > > +notes.<localref>.mergestrategy:: Nit: mergeStrategy > + Which merge strategy to choose if the local ref for a notes merge > + matches <localref>, overriding "notes.mergestrategy". <localref> must > + be the short name of a ref under refs/notes/. See "NOTES MERGE An example would be useful here, methinks: <localref> must be the short name of a ref under refs/notes/, e.g. for configuring the merge strategy for refs/notes/commits, notes.commits.mergeStrategy must be set. Otherwise, the patch looks good to me. ...Johan -- Johan Herland, <johan@xxxxxxxxxxx> www.herland.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html