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*
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*
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