Re: [PATCH] Add branch.*.localmerge and documentation update

On Friday 08 December 2006 22:38, Junio C Hamano wrote:

"Santi Béjar" [off-list ref] writes:

quoted

On 12/8/06, Josef Weidendorfer [off-list ref] wrote:

quoted

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.

I am not so sure about the "localmerge" stuff anymore.

What convenience would it buy us (including but not limited to
new people), and if there is any, would that outweigh the
potential confusion factor to have two different configuration
variables that do exactly the same thing whose sole difference
is which side of the fetched branch namespace it uses to specify
the merge source?

I just came up with a concrete patch.
I am not saying that this is the only true solution.

Actually, Jakubs one with allowing arbitrary refspecs is nice.
The only problem is that it is not consistent which refspec
shortcuts otherwise, or?

However, you should take the documentation part and the warning
when there is no match .