Rebase

Moving your commits to sit after someone else's, so the history reads as one line. It rewrites your commits, which is why a branch already shared with others is not rebased.

• See also: Merge conflict
• See also: Branch
• Used in: Git & Version Control

Back to the glossary