Merge branch 'jc/maint-rebase-rewrite-last-skip' * jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch