Merge branch 'ah/rebase-keep-base-fix'

"git rebase --keep-base <upstream> <branch-to-rebase>" computed the commit to rebase onto incorrectly, which has been corrected. * ah/rebase-keep-base-fix: rebase: use correct base for --keep-base when a branch is given