From: Felipe Contreras Date: Mon, 09 Sep 2013 00:36:21 GMT Subject: Re: [PATCH 0/3] Reject non-ff pulls by default Message-ID: In-Reply-To: On Sun, Sep 8, 2013 at 7:29 PM, Felipe Contreras 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