ee
Merge remote-tracking branch 'origin/master'
asdfd
Merge branch 'master' of github.com:baryonicdm/sandbox
asdfad
asdfasdf
Merge branch 'master' of git@github.com:baryonicdm/sandbox.git