On Sun, Sep 8, 2013 at 7:29 PM, Felipe Contreras <felipe.contreras@xxxxxxxxx> wrote: > My patches pretty much do nothing else but introduce a warning. > Nothing is broken, nothing is changed in the test suite: > > http://article.gmane.org/gmane.comp.version-control.git/233669 > > You are confusing my proposal with Junio's one. Actually my mistake. My patches don't even add a warning, so nothing is changed at all (unless you manually configure pull.mode = merge-ff-only). I only suggested to add the warning, but didn't actually implement it. I'll do that soon. -- Felipe Contreras -- 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