If you want to prevent merge commits from ever entering a particular branch of yours, say master, just do this: git config branch.master.mergeoptions --ff-only -- Jason T. Greene JBoss AS Lead / EAP Platform Architect JBoss, a division of Red Hat