This script is now reliable enough to no longer need investigation
stops.
One can still stop an ongoing step-rebase by hitting Ctrl-C, then
doing a 'git rebase --abort'.
Git provides a mechanism to record conflict solutions done with
one rebase and replaying that when rebasing another branch. That's
what's Rerere is about. Unfortunately, a rebase still stops after
resolving all conflicts with recordings, so convenience is a bit
limited.
If Rerere is disabled in a repo or there are no recorded solutions,
this option has no effect.
Without --first-parent, 'git rev-list' counts commits on merged
branches, too. Not noticed on Teacup, because we have no merges
here, but in another repo this came up.
Standard mode, like without ignoring whitespace changes. Only if
that fails, try again with whitespace ignorance.
Reason for this attempt is, rebases not ignoring whitespace are
significantly faster and much less verbose. As 99% of all rebases
work fine without ignoring whitespace, it's a good idea to try
that first.
This is a tool for rebasing step by step, like described in
issue #81. It reliefs from all the manual typing, just rebase
a topic branch like this:
git checkout <topic branch>
tools/git-step-rebase experimental
Linking or copying this script somewhere into the PATH even allows
to use it from within git:
git step-rebase ...
Markus Hitter