Reputation: 18097
Suppose branches look like this
master: A B C D*
\
my-branch: E F G H*
I want it to look like this
master: A B C D*
\
my-branch: E F G H*
Upvotes: 7
Views: 10598
Reputation: 114230
Just rebase your branch onto master:
git checkout my-branch
git rebase master
Upvotes: 12
Reputation: 28529
Rebase master on your branch, then merge your branch into master.
git checkout my-branch
git rebase master
git checkout master
git merge my-branch
Upvotes: 0