Start the merging-rebase to junio/maint

This commit starts the rebase of 58e7864 to a274e0a

We use the opportunity to skip earlier iterations of the mingw-isatty and
the interactive-rebase patch series. To make it easier to submit the
patches upstream, we also reorder the patches so that patch series which
are more likely to make it upstream come earlier than the others.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho