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. > So overall, cumulative configuration tend to be more cumbersome for the > end user to manage. Okay, you've convinced me. j. -- 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