Re: pull.prompt or other way to slow/disable 'git pull'

2014-05-04 Thread Felipe Contreras
W. Trevor King wrote: > Do you feel folks won't need a way to slow/disable 'git pull' while > they build the ff options and their project's recommended workflow > into their own practice? That's right. > Or do you agree that they will need some kind of helper for the > transition, and just feel t

Re: pull.prompt or other way to slow/disable 'git pull'

2014-05-04 Thread W. Trevor King
On Sat, May 03, 2014 at 04:50:52AM -0500, Felipe Contreras wrote: > Either way it would be impossible for Git to figre out what you want > to do. That's my point. The details of my particular workflow are unimportant. > Anyway I don't see how is this possibly relevant to the topic at > hand. I'

Re: pull.prompt or other way to slow/disable 'git pull'

2014-05-03 Thread Felipe Contreras
W. Trevor King wrote: > On Fri, May 02, 2014 at 05:20:11PM -0500, Felipe Contreras wrote: > > W. Trevor King wrote: > > > > > The 'git pull' (with 'none' mode) explainer just helps retrain folks > > > > > that are already using the current 'git pull' incorrectly. > > > > > > > > If you are going t

Re: pull.prompt or other way to slow/disable 'git pull'

2014-05-02 Thread W. Trevor King
On Fri, May 02, 2014 at 05:20:11PM -0500, Felipe Contreras wrote: > W. Trevor King wrote: > > > > The 'git pull' (with 'none' mode) explainer just helps retrain folks > > > > that are already using the current 'git pull' incorrectly. > > > > > > If you are going to train them to use a configuratio

RE: pull.prompt or other way to slow/disable 'git pull' (was: Pull is Evil)

2014-05-02 Thread Felipe Contreras
W. Trevor King wrote: > I've renamed this sub-thread (which started around $gmane/247835) to > avoid potential confusion/dilution. Thanks. > > > The goal is to train them to do: > > > > > > > % git config --global pull.mode none > > > > % git fetch > > > > % git merge --no-ff > > Sticking

pull.prompt or other way to slow/disable 'git pull' (was: Pull is Evil)

2014-05-02 Thread W. Trevor King
On Fri, May 02, 2014 at 04:18:57PM -0500, Felipe Contreras wrote: > W. Trevor King wrote: > > On Fri, May 02, 2014 at 03:34:34PM -0500, Felipe Contreras wrote: > > > W. Trevor King wrote: > > > > On Fri, May 02, 2014 at 02:13:25PM -0500, Felipe Contreras wrote: > > > > > It would matter almost exac