Re: [PATCH 3/3] builtin-merge: add support for default merge options
From: Jay Soffian <hidden>
Date: 2016-06-15 22:48:27
On Fri, Mar 19, 2010 at 10:19 AM, jean-luc malet [off-list ref] 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 [off-list ref] wrote:quoted
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 [off-list ref] wrote:quoted
Jay Soffian [off-list ref] writes:quoted
On Fri, Mar 6, 2009 at 7:58 PM, Junio C Hamano [off-list ref] wrote:quoted
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 = trueOkay. 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