I've fixed it, please stop pushing to upstream.
On Fri, Feb 21, 2014 at 7:42 PM, Daniel Murphy <yebbl...@gmail.com> wrote: > Good work - you accidentally pushed to master then made things worse by > rewriting history. > > > On Fri, Feb 21, 2014 at 7:28 PM, Daniel Murphy <yebbl...@gmail.com> wrote: > >> Depends on what you are trying to do? >> >> The commit is already in upstream/master, so I don't suggest removing it >> now. >> >> If you really want to undo it, use git revert on the merge commit. >> >> Using rebase or reset on master will rewrite the public history, which at >> least two people have already pulled. >> >> >> On Fri, Feb 21, 2014 at 7:21 PM, Walter Bright <wal...@digitalmars.com>wrote: >> >>> >>> 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 >>> >>> >>> ? >>> >>> >>> >>> >>> _______________________________________________ >>> dmd-internals mailing list >>> dmd-internals@puremagic.com >>> http://lists.puremagic.com/mailman/listinfo/dmd-internals >>> >> >> >
_______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals
