On Tue, Dec 9, 2008 at 10:34, R. Tyler Ballance <tyler@xxxxxxxxx> wrote: > 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? Try this: $ git config branch.stable.mergeoptions "--no-ff" -- lh -- 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