CmdID

CmdID / Commands

git-psykorebase

Rebase a branch on top of another using a merge commit while requiring conflict resolution only once. tldr-pages

On several platforms

Opens CmdID with your command. It is read in your browser and sent nowhere.

Several platforms

from tldr-pages, CC BY 4.0

Rebase a branch on top of another using a merge commit while requiring conflict resolution only once. Part of git-extras.

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

git psykorebase upstream_branchIdentify

Continue after conflicts have been handled

git psykorebase --continueIdentify

Specify the branch to rebase

git psykorebase upstream_branch target_branchIdentify