Git Merge & Rebase with visual

Git Rebase

git rebase yourBranch

Git Merge & Rebase Visual

You can play on Git School