Much more fun like that
Merge remote-tracking branch 'origin/Tom'
Merge remote-tracking branch 'origin/master' into SagieBranch