From: Jay Soffian <jaysoffian@gmail.com>
Date: Sat, 07 Mar 2009 01:56:21 GMT
Subject: Re: [PATCH 3/3] builtin-merge: add support for default merge options
Message-ID: <76718490903061756g4ca88c21h8bf786048d4ad05@mail.gmail.com>
In-Reply-To: <7v63imqhcz.fsf@gitster.siamese.dyndns.org>

On Fri, Mar 6, 2009 at 7:58 PM, Junio C Hamano <gitster@pobox.com> 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.

> So overall, cumulative configuration tend to be more cumbersome for the
> end user to manage.

Okay, you've convinced me.

j.