[dmd-internals] Halp! need help fixing git master for dmd

[Walter Bright]

On 2/21/2014 12:04 AM, Walter Bright wrote:
> How do I undo this commit?
>
> https://github.com/D-Programming-Language/dmd/commit/6f344e7abbc922b51bb0aeaa6fe7261a4ca1826f 
>
>
> Not sure how it happened. I was trying to fix 
> dmd/test/fail_compilation/testCols.d which has CRLFs in it which completely 
> screw up git.

Ok, which one do I do:

git rebase -i HEAD~2
git push origin +master

or:

git reset --soft HEAD^
git push origin +master

?