On Fri, Mar 14, 2014 at 10:33 AM, Marc Branchaud <marcnarc@xxxxxxxxxxx> wrote: > I know this approach was suggested earlier, but given these dangers it seems > silly to give this big warning on a plain "git reset" but still go ahead and > do the things the warning talks about. > > Is there any issue with changing "git reset" to error-out now but letting > "git reset --mixed" proceed? Something like (note the reworded warning message): Yeah, I would have preferred to have "git reset" error out right now, because the messed up work tree can be quite a pain to clean up. The main argument for issuing the warning is about maintaining compatibility. For the users that really did mean "--merge", the warning is silly. It's basically saying "We know that you're about to mess up your work tree, but we let you mess up anyway. Learn the correct way so that you don't mess up next time". It actually doesn't seem too bad if we did make "git reset" to error out (during a merge) right away. By erroring out, the command won't cause some irreversible damage, and users don't lose data. Yes, it breaks compatibility, but perhaps not in a bad way? I'm really fine with either. Junio? -- 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