Git rebase and merge form : master

rebase.md

checkout to your current working feature/branch

git checkout -b feature/branch

checkout new tmp branch from feature/branch

git checkout -b tmp

delete feature/branch for merging commit logs

git branch -D feature/branch

checkout to the base branch

git checkout master

checkout feature/branch from master

git checkout -b feature/branch

merge tmp( this contains your working history ) to feature/branch

git merge tmp --squash

commit amend with new message, this will be on 1 single comment

git commit -m "Fix Message"

force push

git push origin feature/branch -f