An overview of concepts & terms around Git & Version Control
What is a rebase in Git?
In Git, the rebase command integrates changes from one branch into another. It is an alternative to the better known "merge" command.
Most visibly, rebase differs from merge by rewriting the commit history in order to produce a straight, linear succession of commits.
The Git Cheat Sheet
No need to remember all those commands and parameters: get our popular "Git Cheat Sheet" - for free!
In case you are using the Tower Git client, working with rebase is very easy: you can simply drag the branch you wish to integrate, and - while keeping the ALT key pressed - drop it onto the receiving branch.
- Check out the Rebase as an Alternative to Merge chapter in our free online book
- More frequently asked questions about Git & version control