Assuming the last intended-for-master commit was 3512988, this reverts the intervening commits.
Let me know if I picked the wrong commit! Or feel free to tackle that yourself: I just used git checkout 3512988 . and then add / remove files as necessary to get git diff 3512988 to be empty. It's a bit coarse perhaps, but it gets the job done, and works no matter what the history looks like.
Assuming the last intended-for-master commit was 3512988, this reverts the intervening commits.
Let me know if I picked the wrong commit! Or feel free to tackle that yourself: I just used
git checkout 3512988 .
and then add / remove files as necessary to getgit diff 3512988
to be empty. It's a bit coarse perhaps, but it gets the job done, and works no matter what the history looks like.