From: jean-luc malet <jeanluc.malet@gmail.com>
Date: Fri, 02 Apr 2010 17:19:44 GMT
Subject: Re: [PATCH 3/3] builtin-merge: add support for default merge options
Message-ID: <h2m1de9d39c1004021019sd8e8bf79ide3f0516353c069c@mail.gmail.com>
In-Reply-To: <76718491003190754l217e1247t16b7f1b9f39c6182@mail.gmail.com>

Is there someone that can review this patch and maybe include it into
next GIT release?
I think it is really usefull especially when used in company
environment where default policies have to be set
thanks and regards
JLM

On Fri, Mar 19, 2010 at 3:54 PM, Jay Soffian <jaysoffian@gmail.com> wrote:
> On Fri, Mar 19, 2010 at 10:19 AM, jean-luc malet
> <jeanluc.malet@gmail.com> wrote:
>> Hi!
>> I would like to know the status about this patch...
>> I think this is a useful feature to have a default configuration
>> settable for all branch.<name>.* options
>> thanks and regards
>
> I lost interest in it apparently. I see it's still marked in my TODO,
> but I haven't had any personal time to spend on git lately.
>
> j.
>
>> On Sat, Mar 7, 2009 at 8:31 PM, jean-luc malet <jeanluc.malet@gmail.com> wrote:
>>> as a user,
>>> 1) I looked how to override defaults, since merge seems to use --ff as
>>> default, I looked if there was any global config to override that.
>>> nothing found... so go back to google
>>> 2) I found on the web that we can set it using
>>> branch.branchname.mergeoptions so I said "what if I use a branch named
>>> *, the config file was correct and git didn't insult me so.... but not
>>> the expected result...
>>>
>>> since the commands have allready defaults builtin, why not storing
>>> thoses defaults in the config file? like this it's easier to update
>>> them or change the way git behave....
>>> JLM
>>>
>>> On Sat, Mar 7, 2009 at 8:18 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>>> Jay Soffian <jaysoffian@gmail.com> writes:
>>>>
>>>>> 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.
>>>>
>>>> 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.
>>>>
>>>>
>>>
>>>
>>>
>>> --
>>> KISS! (Keep It Simple, Stupid!)
>>> (garde le simple, imbécile!)
>>> "mais qu'est-ce que tu m'as pondu comme usine à gaz? fait des choses
>>> simples et qui marchent, espèce d'imbécile!"
>>> -----------------------------
>>> "Si vous pensez que vous êtes trop petit pour changer quoique ce soit,
>>> essayez donc de dormir avec un moustique dans votre chambre." Betty
>>> Reese
>>> http://www.grainesdechangement.com/citations.htm
>>>
>>
>>
>>
>> --
>> KISS! (Keep It Simple, Stupid!)
>> (garde le simple, imbécile!)
>> "mais qu'est-ce que tu m'as pondu comme usine à gaz? fait des choses
>> simples et qui marchent, espèce d'imbécile!"
>> -----------------------------
>> "Si vous pensez que vous êtes trop petit pour changer quoique ce soit,
>> essayez donc de dormir avec un moustique dans votre chambre." Betty
>> Reese
>> http://www.grainesdechangement.com/citations.htm
>>
>



-- 
KISS! (Keep It Simple, Stupid!)
(garde le simple, imbécile!)
"mais qu'est-ce que tu m'as pondu comme usine à gaz? fait des choses
simples et qui marchent, espèce d'imbécile!"
-----------------------------
"Si vous pensez que vous êtes trop petit pour changer quoique ce soit,
essayez donc de dormir avec un moustique dans votre chambre." Betty
Reese
http://www.grainesdechangement.com/citations.htm