Merge remote-tracking branch 'origin/branch1'
Merge branch 'master' of https://github.com/TianNiu/git-what_is_branch