Junio C Hamano wrote: > Sverre Rabbelier <srabbelier@xxxxxxxxx> writes: >> Can someone comment on whether "git reset --merge" is a good >> implementation of "git merge --abort"? [...] > I think it depends on in what state you started from and how the merge > operation stopped. If your index was clean, probably yes, but "git reset > --merge" may not be something you may want to do if the merge stopped > because you had previously added something. I suppose it would be safe if one checks that MERGE_HEAD is present first? It would apply to failed cherry-picks, too. Not sure if that's a good or a bad thing. -- 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