生成key的命令:
<span style="font-size:18px;">ssh-keygen -C "git用户名" </span>
clone项目:
<span style="font-size:18px;">git clone git@192.168.0.1:xxx/项目名</span>
提交项目:
<span style="font-size:18px;">git add .
git commit -am 'msg'
git pull origin master
git push origin master</span>
git checkout better_branch
git merge --strategy=ours master # keep the content of this branch, but record a merge
git checkout master
git merge better_branch
git log
git reset --hard 版本号