This doesn't solve the problem of wanting to redo from another "do history branch" while preserving the changes you've done in your current history branch. Usin

This doesn't solve the problem of wanting to redo from another "do history branch" while preserving the changes you've done in your current history branch. Using the notation of the article, you have done: A -> B -> C -> rewound to B -> D -> E Now at that E point, you'd want to have C too. (I'm assumikng there is no conflict between C and E.) There is no point in the linear history where you have both E and C. Sure you can go back to C, or go back to E. Or go back to C then decide to go back to E again. But you can't have both. In vim, I use the fact that the yank buffers are not part of the undo/redo history, only changes to the file are. So I undo to the point I had the change I want back, yank them in a named buffer, redo and put the yanked buffer. You cannot go to an alternate history, but at least you can get back stuff you've deleted. In git, what I describe is pretty-close to cherry-pick from a commit in a branch you deleted that you find using the ref-log.