Hacker News new | ask | show | jobs
by Extigy 1350 days ago
If a rebase goes wrong and you want out you can run,

  git rebase --abort
to return to where you were beforehand.

I find that git is actually very good at explaining what is going on and what you should do next by just running git status in the middle of some process like rebasing and reading what it says.

Even if it all goes really wrong the git reflog has always saved me.

1 comments

Ok, but what do you do when it goes wrong every single time you've tried it? That's what happens at work, so I gave up and use merge+squash on gitlab.