Temporary, for testing only

Merge branch 'rebase-i'

This works around the problem described in
https://github.com/git-for-windows/git/issues/542

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