修改提交信息 测试config global user.name
update
update
Merge branch 'master' of https://github.com/xiaowtz/resource