git reset --soft

git reset --soft origin/<upstream-branch>
git reset --soft HEAD~3
git reset --soft @{u}

git reset --soft origin/<upstream-branch>
git commit -m "Consolidated changes for latest changes"
git push origin your-branch

• Merge all your local commits in a single commit

See also

• git reset [--merge | --hard | --soft ]
• git rebase, git rebase --interactive