Johan Herland <johan@xxxxxxxxxxx> writes: > I haven't received any replies to my attempt to describe the context in > which "git submodule update --merge" is useful. A hint as to whether my > argument is valid, or just crap, would be nice. FWIW, I didn't find "rebase makes sense but merge doesn't" argument very convincing to begin with. Because the configuration variable is about "update" action, I agree it makes sense to do > submodule.<name>.update = checkout/rebase (checkout if unset) from the UI standpoint. I do not know what the sensible repertoire of options nor what the default should be, though. That's up to the submodule using people to sort out. -- 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