Ability to step back (optionally several steps) and rerun rebase. Main use - in case of merge conflict resolve them first in the branch (for example by merging master into it) and then merge it back.
Example of solution (a bit cumbersome though, maybe there are better options).
Should show todo in form of
# pick aaa
# <hash>
# merge ...
# <hash>
merge ... <---- the current step
after todo is edited, all changes on HEAD are reset and steps are executed. If you commented some earlier steps, you can rewind rebase execution (don't forget to use reset)
Ability to step back (optionally several steps) and rerun rebase. Main use - in case of merge conflict resolve them first in the branch (for example by merging master into it) and then merge it back.
Example of solution (a bit cumbersome though, maybe there are better options). Should show todo in form of
after todo is edited, all changes on HEAD are reset and steps are executed. If you commented some earlier steps, you can rewind rebase execution (don't forget to use
reset)