Используйте rebase in git command

git rebase branch_name
akileus