git branch合并

2257  git branch -a|grep master
2258  git branch -a|grep common
2259  man git-merge
2260  git merge origin/jbc
2261  gitk
2262  git log
2263  git branch
2264  git checkout -b master origin/master
2265  git merge origin/jbc
2266  gitk 

== merge master into feature branch on feature branch

repo start rebase0627 .
git fetch
git merge origin/master
git mergetool .
git commit
git push to feature branch