On Thu, May 01, 2014 at 08:14:29PM -0500, Felipe Contreras wrote:
> W. Trevor King wrote:
> > My proposed --prompt behavior is for folks who think “I often run
> > this command without thinking it through all the way.  I'm also
> > not used to reading Git's output and using 'reset --hard' with the
> > reflog to reverse changes.  Instead of trusting me to only say
> > what I mean or leaving me to recover from mistakes, please tell me
> > what's about to change and let me opt out if I've changed my
> > mind.”
> 
> Unfortunately those folks by definition wouldn't know about the
> --prompt option.

But once such folks are identified, you just have to convince them
(once) to set the pull.prompt config.  That's a lot easier than
convincing them (for every pull) to set the appropriate ff flag.

Cheers,
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy