Heya, On Fri, Oct 22, 2010 at 10:12, Johan Herland <johan@xxxxxxxxxxx> wrote: > Yes, that makes sense to me, especially if we make a 'git merge --abort' > synonym. Alternatively, we can make 'git merge --abort' check for > MERGE_HEAD, and then defer to 'git reset --merge', while leaving 'git > reset --merge' as-is. ACK to that. I think people using 'git reset --merge' know what they're doing, and should be able to clobber their changes (viz. `git reset --hard`), while 'git merge --abort' should do more handholding and make sure you don't lose any data. (If I had more time I'd implement that 'core.nodataloss' flag...) -- Cheers, Sverre Rabbelier -- 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