git rebase

Replays your branch's commits on top of another branch's tip, producing linear history instead of a merge commit.

#git #rebase

Command

Rebase onto main

SHELL

1git switch <branch-name>

2git rebase main

4# move a range of commits onto a different base

5git rebase --onto <new-base> <old-base> <branch-name>

7# abort and go back to how things were before the rebase started

8git rebase --abort

Warning

Never rebase commits that other people have already pulled — rebasing rewrites commit hashes, so anyone based on the old ones ends up with duplicated, diverging history.