Hacker News new | ask | show | jobs
by shandor 2655 days ago
Rebase is not dangerous. It can't be, since it only works on the local repo.

It's non-fast-forward pushes that are dangerous. And they're dangerous whether anyone uses rebase or not.

2 comments

Exactly, it's the force pushes that are the problem.
Loss of un-pushed work can be an issue, which I think is the thing that makes people wary.
Almost always, you can recover a bad rebase via git reflog.
That's true, but it's an obscure feature, not a convenient "undo" button; to the average insecure git user you might as well tell them that their work has been eaten by a dragon and they can recruit another dragon to get it back.
Reflog may not be known by the average git user, but I think it is pretty convenient - just call `git reflog`, copy the hash before the rebase, and checkout/reset to that hash. Doesn't get much easier than that.