If you're not familiar with the local history feature, it's a game changer. I use it rather than starting a new branch for experimental code, it's huge -- much

If you're not familiar with the local history feature, it's a game changer. I use it rather than starting a new branch for experimental code, it's huge -- much faster than git branching, and you can do incremental rewind. The edit history goes back pretty far too, it has saved me after more than one problematic rebase/merge.