From: Junio C Hamano Date: Sat, 07 Mar 2009 07:18:37 GMT Subject: Re: [PATCH 3/3] builtin-merge: add support for default merge options Message-ID: <7vzlfxpzqq.fsf@gitster.siamese.dyndns.org> In-Reply-To: <76718490903061756g4ca88c21h8bf786048d4ad05@mail.gmail.com> Jay Soffian writes: > On Fri, Mar 6, 2009 at 7:58 PM, Junio C Hamano wrote: >> I think it would be much better if you did not introduce a new >> configuration merge.options which is not consistent with everything else >> to begin with. >> >> Instead, if your addition was literally to allow saying things like this, >> it would be much easier to understand. >> >>        [branch "*"] >>                mergeoptions = ... >>                remote = origin >>                rebase = true > > Okay. That's probably a more invasive patch, because a lot more code > paths look at [branch ...], but I'll look into it. Note that you do not have to cover branch.*.remote and other things in the same patch. The first one could just handle branch.*.mergeoptions and you can let later patches to implement the fallbacks for other variables.