W. Trevor King wrote: > On Thu, May 01, 2014 at 07:37:04PM -0500, Felipe Contreras wrote: > > If that was the case the user wouls have run `git merge > > --no-ff`. Only expereinced users would answer 'no'. > > Folks who are setting any ff options don't need any of these training > wheels. Indeed. > 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. > > For example, I'm thinking that by default when the a fast-forward is > > possible, just do it, … > > But just because a ff is possible doesn't mean it's what the > user/project wants. Yeah, so? We cannot read minds, especially not the minds of the people that are not sitted in from of the computer. > It may be the most likely guess, but why guess when they've explicitly > asked for a prompt? *If* the user has specifically asked for a prompt, sure, ask. But I'm not particularly interested in that, because I'm certain very very few people would use --prompt. I'm interested in the defaults. -- 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