From: Santi Béjar <sbejar@gmail.com>
Date: Fri, 08 Dec 2006 20:52:15 GMT
Subject: Re: [PATCH] Add branch.*.localmerge and documentation update
Message-ID: <8aa486160612081252t1e245104x58c8a6654d887af5@mail.gmail.com>
In-Reply-To: <200612082012.19167.Josef.Weidendorfer@gmx.de>

On 12/8/06, Josef Weidendorfer <Josef.Weidendorfer@gmx.de> wrote:
> Clarify the meaning of branch.*.merge option and add a similar
> branch.*.localmerge option, which can be used to specify a local
> tracking branch to be merged by default.
>
> Previously, if branch.*.merge was specified but did not match any
> ref, the message "No changes." was not really helpful regarding
> the misconfiguration. This now gives a warning.
>
> The value of branch.*.merge can be a list to get an octopus
> merge. I chose the same way for branch.*.localmerge, and if
> you specify both options, the octopus merge will have even
> more parents ;-)
>
> Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>

Ack for the documentation part. But the localmerge part is almost
equivalent to my patch to allow the branch.<name>.remote equal to ".".