vgarro

git checkout master
git pull
git checkout -b <my_branch> origin/master   # This will make the rebase automatically when you do git pull
# do my job
git commit -m 'my work1'
git commit -m 'my work2'
git commit -m 'my work3'

git pull                     # At this point, remote changes gets added before 'my work1' if any
git push origin  <my_branch> # branch is updated using remote and new changes