git的使用(二)
上篇文章git命令
git config --global user.name "Luo"
git config --global user.email "123456@qq.com"
git config --global user.name
git config --global user.email
git init
git add 文件夹或文件
git add .
git commit -m "First commit."
忽略文件
.gitignore 文件中添加忽略的文件 格式:/加上文件、文件夹或路径
查看修改内容
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
}
使用命令查看修改的内容
git status
git diff (可加上文件的路径,显示某一个变化)
git status
![git status](https://img-blog.csdn.net/20170106103255815?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvaGV5aWFpcWluZw==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
git diff
![git diff](https://img-blog.csdn.net/20170106103338316?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvaGV5aWFpcWluZw==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
撤销未提交的修改
这种只能撤销未经过add 的修改,注意注意!!!!!
git checkout app/src/main/java/com/tianqiao/luo/gittext3/MainActivity.java
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
}
撤销
![撤销](https://img-blog.csdn.net/20170106104559567?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvaGV5aWFpcWluZw==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
撤销提交过的修改
这种能撤销add,之后你需要在进行checkout
git reset HEAD app/src/main/java/com/tianqiao/luo/gittext3/MainActivity.java
查看提交记录
git log
git log 加上命令id(MD5) -1 (-p)
![提交记录](https://img-blog.csdn.net/20170106105659707?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvaGV5aWFpcWluZw==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
这个是查看的记录
![记录](https://img-blog.csdn.net/20170106110507312?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvaGV5aWFpcWluZw==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
git命令
git status
git diff (可加上文件的路径,显示某一个变化)
git checkout app/src/main/java/com/tianqiao/luo/gittext3/MainActivity.java
git reset HEAD app/src/main/java/com/tianqiao/luo/gittext3/MainActivity.java
git log
git log 加上命令id(MD5) -1 (-p)
总结
马上就要过年了,时间真的过的很快很快,祝大家在新的一年过的开开心心,身体健康!!!