git branches alias
Merge branch 'master' into ccap