Menu
Rebasing a branch in Git is a way to move the entirety of a branch to another point in the tree. The simplest example is moving a branch further up in the tree.
git checkout branch2 # Go to your local branch. Use -f to force the checkout. git reset HEAD --hard # Drop all non-committed changes. git rebase branch1 # Rebase on top of branch1.
In summary, when looking to incorporate changes from one Git branch into another: Use merge in cases where you want a set of commits to be clearly grouped together in history. Use rebase when you want to keep a linear commit history. DON'T use rebase on a public/shared branch.
You've got what rebase does backwards. git rebase master does what you're asking for — takes the changes on the current branch (since its divergence from master) and replays them on top of master, then sets the head of the current branch to be the head of that new history. It doesn't replay the changes from master on top of the current branch.
Another way to look at it is to consider git rebase master as:
Rebase the current branch on top of
master
Here , 'master' is the upstream branch, and that explain why, during a rebase, ours and theirs are reversed.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With