master branch1
1 git add
2 git commit
3 git check out master
4 git pull origin master
5 git merge branch1
6 gitk& (查看改变的地方)
7 git push origin master
8 git checkout branch1
恢复删除
1 .查看已删除的文件
git ls-files --deleted
2.恢复删除文件
git checkout - <delete file>
例子:git checkout - HLR_Offline/test/com/ericsson/consistency/test/t.java
3.批量恢复删除文件
git ls-files -d | xargs git checkout - <delete files>
例子: git ls-files -d | xargs git checkout - HLR_Offline/test/com/ericsson/consistency/test/*