git: merge and rebase