Linus Torvalds <torva...@linux-foundation.org> writes: > Mine was slightly different, I just went with a "unrelated" merge option.
Yeah, I was debating myself if this should be -Xunrelated specific to recursive or an option that is meant for all strategies. I can go either way, but I think a command-wide option is logically the right way to go, because you do not want two-project merge by default no matter what strategy is used (and some of you may know that I had a long term plan with no lines of code yet to do yet another merge strategy). > I'll attach my two patches anyway, if for no other reason than the > fact that I actually wrote a new test for this. Thanks, but after updating existing scripts, I think those changes already make sure that two-project merges work with the option. What is missing in my version is a new test that ensures the command fails a two-project merge by default. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
