How to update topic branch with upstream changes on master?

Question

I start some work on a topic branch

    •-•-• < topic
   /
•-•       < master

I push the topic branch

$ git push origin t         


        

Answer 1

; update master
git checkout master
git pull --rebase origin master  

; rebase topic
git rebase master topic

; push topic (force)
git push -f origin topic