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@xxxxxxxxx> wrote: > 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. > > -- 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 -- 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
