git add -u

git commit -m "commit message"

git checkout master

git pull origin master

git checkout local_branch

git rebase master

git rebase -i HEAD~no_of_commit_msg

top one will be pick, remaining will be sqash

git push -f origin master

git tag v1.1.0 commit_id

git push origin v1.1.0

Change author of Commit

git commit --amend --author="mail_id_of_author"