dev on dev
dev on dev2
merge dev and dev2
new dev on dev
other dev on dev
merge branch 'dev' of github.com:liuxiaogang/learngit into dev