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>.

Install

All systems
curl cmd.cat/git-psykorebase.sh
Debian Debian
apt-get install git-extras
Ubuntu
apt-get install git-extras
image/svg+xml Kali Linux
apt-get install git-extras
Fedora
dnf install git-extras
Windows (WSL2)
sudo apt-get update sudo apt-get install git-extras
OS X
brew install git-extras
Raspbian
apt-get install git-extras
Dockerfile
dockerfile.run/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>.

  • 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

© tl;dr; authors and contributors