Eyvind Bernhardsen <eyvind-git@xxxxxxxxxxxxxx> writes: > I read it as a request for pull/merge --ff-only (based on "abort if the > workdir is dirty or is not a fast-forward update"). This feature has > been implemented twice, but never included: I'd also like such a feature. [It seems like such an obvious partner to "--no-ff" (etc), that it's kind of surprising it isn't there already -- I think there have been multiple times in the past where I've spent time grovelling the pull/merge documentation looking for the right option name to do this, only to give up in confusion when I couldn't find it...] -Miles -- Love is the difficult realization that something other than oneself is real. [Iris Murdoch] -- 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