[hinkley]

I have to use reflog, rebase -i and frequent commits to cover the spectrum of edge cases I deal with weekly. No two of them accomplish the entire job.

[sunshowers]

You should try out Jujutsu :)

[hinkley]

It's on my list.