Subject: Re: [PATCH v3] Add default merge options for all branches

From: Jonathan Nieder <[email-masked]>
Date: Tue, 3 May 2011 04:49:44 -0500

Jonathan Nieder wrote:
> Michael Grubb wrote:

>> The approach taken is to make note of whether a branch specific
>> mergeoptions key has been seen and only apply the global value if it
>> hasn't.
>
> What happens if the global value is seen first?
[...]
> With whichever of the changes below make sense,
> Reviewed-by: Jonathan Nieder <[email-masked]>

Agh, what I meant is "except as noted above".  I am still worried
about (and have not carefully reviewed) the following case:

	[branch "*"]
		mergeoptions = --foo

	[branch "topic"]
		mergeoptions = --bar

Does it produce different behavior from

	[branch "topic"]
		mergeoptions = --bar

	[branch "*"]
		mergeoptions = --foo

?  If so, is that a good thing, and is it documented?

Sorry for the lack of clarity.