[git] How can I keep my branch up to date with master with git?