On Wed, Jan 28, 2009 at 13:53, Yuval Kogman <nothingmuch@xxxxxxxxxxxx> wrote: > This patch adds an --ff-only flag to git-merge. When specified git-merge > will exit with an error whenver a merge will not be a simple fast > forward, similar to the default behavior of git push. I like! This calls for a new alias 'git config alias.integrate "merge --no-ff"', thanks! *hopes this hits next soon* -- Cheers, Sverre Rabbelier -- 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
