Sverre Rabbelier <srabbelier@xxxxxxxxx> writes: > Can someone comment on whether "git reset --merge" is a good > implementation of "git merge --abort"? If we can get an Ack from > someone I'd love to see this implemented. 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. -- 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