News for hackers. Stuff that matters.

A comment on Write yourself a Git (2018). Parent comment

Re:Write yourself a Git (2018) by shandor on Thursday March 14, 2019 @11:09AM (#19389895)
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.

[ Parent | on HN ]
Re:Write yourself a Git (2018) by collinmanderson on Saturday March 16, 2019 @10:16AM (#19407899)
Exactly, it's the force pushes that are the problem.
[ Parent | on HN ]
Re:Write yourself a Git (2018) by pjc50 on Thursday March 14, 2019 @11:11AM (#19389914)
Loss of un-pushed work can be an issue, which I think is the thing that makes people wary.
[ Parent | on HN ]
Re:Write yourself a Git (2018) by palebluedot on Thursday March 14, 2019 @12:04PM (#19390500)
Almost always, you can recover a bad rebase via git reflog.
[ Parent | on HN ]
Re:Write yourself a Git (2018) by pjc50 on Thursday March 14, 2019 @12:38PM (#19390880)
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.
[ Parent | on HN ]
Re:Write yourself a Git (2018) by GhostVII on Thursday March 14, 2019 @09:31PM (#19395670)
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.
[ Parent | on HN ]