From: Eric Sunshine <sunshine@sunshineco.com>
Date: Wed, 12 Aug 2015 00:11:12 GMT
Subject: Re: [PATCH v4 4/4] notes: teach git-notes about notes.<ref>.merge option
Message-ID: <CAPig+cRCmuxqVSqFfF7v-aOKEohfPjAYFAaos5XOz4uWD_psdQ@mail.gmail.com>
In-Reply-To: <1439326641-9447-5-git-send-email-jacob.e.keller@intel.com>

On Tue, Aug 11, 2015 at 4:57 PM, Jacob Keller <jacob.e.keller@intel.com> wrote:
> Add new option "notes.<ref>.merge" 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@gmail.com>
> ---
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 488c2e8eec1b..2c283ebc309e 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1912,6 +1912,12 @@ notes.merge::
>         STRATEGIES" section of linkgit:git-notes[1] for more information
>         on each strategy.
>
> +notes.<localref>.merge::
> +       Which merge strategy to choose if the local ref for a notes merge
> +       matches <localref>, overriding "notes.merge". <localref> just be a

s/just/must/

> +       fully qualified refname. See "NOTES MERGE STRATEGIES" section in
> +       linkgit:git-notes[1] for more information on the available strategies.
> +