rebase git branch with master