Re: Reverting a range of commits with conflict

2019-04-01 Thread Junio C Hamano
Sam Lee writes: > It brings up EDITOR twice and I end up with two commits. > I can squash them. But, I don't know if this is a desired behavior. It is my understanding that the users who do want a single revert of multiple commits are expected to squash them (by choosing which ones to squash int

Reverting a range of commits with conflict

2019-04-01 Thread Sam Lee
Given: A-B-C-D-E (HEAD) I want to create a single commit that reverts A-B-C So, I execute: git revert --no-commit A~..C which causes conflict (while reverting C, it seems). I resolve conflicts and I continue: git revert --continue --no-commit And, it complains: fatal: revert: --no