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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jay Soffian <jaysoffian@xxxxxxxxx> writes:

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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux