Hi Johannes, > This should probably be added to config.txt and > Documentation/git-pull.txt, too, right?
Yep, I meant to note that I'd do that after getting an initial confirmation that the pull.preserve-merges was the preferred approach. (I was being lazy and didn't want to write up docs only to switch to overloading pull.rebase or what not.) But I'll go ahead and do that. > https://github.com/msysgit/git/commit/b733454b Interesting! > Feel free to play with it if you want! I'll poke around out of curiosity, but no promises, as, yes, this is a tricky bit of functionality that can quickly lead to a lot of lost sleep. :-) - Stephen -- 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