From: brian m. carlson Date: Mon, 09 Sep 2013 00:38:55 GMT Subject: Re: [PATCH 0/3] Reject non-ff pulls by default Message-ID: <20130909003855.GH5359@vauxhall.crustytoothpaste.net> In-Reply-To: On Sun, Sep 08, 2013 at 07:36:21PM -0500, Felipe Contreras wrote: > 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. I still wouldn't be crazy about the change, but if there's a warning, I could live with it. I think that's probably the best course of action if there's going to be a change here. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187