04-02-2016, 05:56 PM -
Assuming that upstream is the upstream, then you can simply do:
git rebase upstream/master
And if you have some uncommitted local changes, then:
git rebase upstream/master --autostash
git rebase upstream/master
And if you have some uncommitted local changes, then:
git rebase upstream/master --autostash