"R. Tyler Ballance" <tyler@xxxxxxxxx> writes: > Is there a header macro I can define or a config option I could define > to make --no-ff on `git pull` implicit instead of explicit? Making sure > we are always generating merge commits as a "just-in-case" safe guard > about merge-happy developers who think after hitting enter? :) branch.<name>.mergeoptions ? -- Jakub Narebski Poland ShadeHawk on #git -- 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