git shortcuts
Merge branch 'master'