git psykorebase

all

Rebase a branch on top of another using a merge commit and only one conflict handling. Part of `git-extras`.

Examples (3)

Rebase the current branch on top of another using a merge commit and only one conflict handling

git psykorebase upstream_branch

Continue after conflicts have been handled

git psykorebase --continue

Specify the branch to rebase

git psykorebase upstream_branch target_branch