Jonathan Nieder wrote: > Michael Grubb wrote: >> The approach taken is to make note of whether a branch specific >> mergeoptions key has been seen and only apply the global value if it >> hasn't. > > What happens if the global value is seen first? [...] > With whichever of the changes below make sense, > Reviewed-by: Jonathan Nieder <jrnieder@xxxxxxxxx> Agh, what I meant is "except as noted above". I am still worried about (and have not carefully reviewed) the following case: [branch "*"] mergeoptions = --foo [branch "topic"] mergeoptions = --bar Does it produce different behavior from [branch "topic"] mergeoptions = --bar [branch "*"] mergeoptions = --foo ? If so, is that a good thing, and is it documented? Sorry for the lack of clarity. -- 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