Rebase: Auto-skip commits already in upstream

(fixes issue #2086)

Signed-off-by: Johan 't Hart <johanthart@gmail.com>