git psykorebase

Rebase a branch on top of another using a merge commit and only one conflict handling. Part of git-extras. More information: https://github.com/tj/git-extras/blob/master/Commands.md#git-psykorebase.

git psykorebase upstream_branch

git psykorebase --continue

git psykorebase upstream_branch target_branch