robodude666
Member
Git hates me. I am sad.
So, pretend your friend, yes friend... committed something that wasn't supposed to be committed. How do you seamlessly delete those commits without anyone knowing they ever existed?
I tried to ... I mean, my friend tried to rebase and delete the commits from the interactive mode, but he says it made things work.
-robodude666
mbolivar
LeafLabs
heh, get on irc and we'll talk
edit: in short though, let's say you're on your master branch and haven't pushed the changes
then first do
$ git rebase -i origin/master
and delete the lines for the commits you don't want, save and quit
you should be good
you can still get on IRC if you want some more advice
perry
Administrator
hi robodude,
You can find the last commit you want to go back to with:
git log
That will give you the SHA hash of the commit you want to go back to. In order to discard
your changes and go back to that state, use:
git reset --hard <SHA_HASH>
If you already pushed the bad commits to the world, you can change history by pushing
your new history with:
git push --force origin
Keep in mind that doing this will change history for anybody that has already pulled from
your repository and cause all sorts of headaches. There are ways to get out of it but it takes
some git-fu that would take a while to explain.
-perry
You must log in to post.