[git] fix ps1 branch name
Merge branch 'master' into macbook