Re: [PATCH 3/3] builtin-merge: add support for default merge options

On Fri, Mar 6, 2009 at 5:46 PM, Junio C Hamano [off-list ref] wrote:

When you are on branch "frotz", your config have both merge.options and
branch.frotz.mergeoptions, and you give some other options from the
command line, how should they interact?  I'd expect the branch.*.options
to take effect, ignoring merge.options entirely.

Really? I didn't think that would be consistent with the fact that the
the command line options override branch.*.options, but don't replace
them. So I specifically coded it such that there are three separate
layers all merged together. (Which is also how I documented it in the
man page.)

If for some reason you would want to have cumulative options across

Which I do, or I wouldn't have coded it that way. :-)

branch.*.merge, merge.options and the command line, then you would instead
keep two separate strings, and call git_config_option_string() for both of
them, before processing the real command line options.

Ah, right that would be better.

j.