git-psykorebase

git psykorebase primary-branch [secondary-branch] [--no-ff]git psykorebase --continue

git psykorebase rebases a branch onto another by checking out the primary branch, branching from it, and merging the secondary branch in with a single generated merge commit, rather than replaying every individual commit like `git rebase` does. This git-extras command avoids re-resolving the same conflict once per commit, at the cost of collapsing the rebase into one merge point.If the merge conflicts, it leaves a temporary `<secondary>-rebased-on-top-of-<primary>` branch checked out and tells you to resolve the conflict and commit, then run `git psykorebase --continue` to finish renaming the branches into place.

PRIMARY-BRANCH

Branch to rebase onto.

Branch being rebased; defaults to the current branch.

Force a merge commit instead of a fast-forward.

Resume after manually resolving a conflict.

Part of git-extras. Because it uses one merge instead of replaying commits, individual commit-level history from the secondary branch relative to the primary is not preserved the way an interactive rebase would.

git-rebase(1), git-merge(1), git-extras(1)

Source code · Documentation