Commit Graph

6 Commits

Author SHA1 Message Date
Markus Hitter 606611a070 git-step-rebase: count distance to branch head correctly.
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.
2017-06-04 17:05:37 +02:00
Markus Hitter 7a36302cd7 git-step-rebase: try the faster standard rebase mode.
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.
2017-04-25 20:26:23 +02:00
Markus Hitter 92926aadf5 git-step-rebase: slightly nicer progress report. 2017-04-25 20:00:13 +02:00
Markus Hitter b1ba8b4003 git-step-rebase: --whitespace=fix was apparently fixed. 2017-04-25 19:49:48 +02:00
Markus Hitter 959e803eac Git tools: a few minor improvements.
Behaviour should be unchanged, but the same tools can be used for
gEDA/pcb now, too.
2015-09-14 15:24:03 +02:00
Markus Hitter 5846961744 Tools: add git-step-rebase.
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 ...
2015-07-30 16:21:32 +02:00