Git文件操作

一、git rm

1.1、rm

执行shell的rm指令将test文件删除

$ rm test

huangxiaolei@huangxiaolei MINGW64 /f/GitTest (master)
$ git status
On branch master
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        deleted:    test

no changes added to commit (use "git add" and/or "git commit -a")

huangxiaolei@huangxiaolei MINGW64 /f/GitTest (master)
$ git add test

huangxiaolei@huangxiaolei MINGW64 /f/GitTest (master)
$ git commit -m "delete test"
[master fa8a517] delete test
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 test

huangxiaolei@huangxiaolei MINGW64 /f/GitTest (master)
$ git status
On branch master
nothing to commit, working tree clean

通过rm指令可以删除一个文件，通过git add/commit操作来完成一次新的提交。

1.2、git rm

git rm指令省去了重新执行git add 的操作。

$ git rm test
rm 'test'

huangxiaolei@huangxiaolei MINGW64 /f/GitTest (master)
$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        deleted:    test


huangxiaolei@huangxiaolei MINGW64 /f/GitTest (master)
$ git commit -m "delete test"
[master ef105fb] delete test
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 test

二、文件暂存

git stash指令将当前修改暂存起来，把修改前的分支作为新的分支，而不会带有新修改的代码。

git stash list指令查看当前暂存的内容。

通过git stash apply指令或者git stash pop指令进行内容恢复。前者会删除记录，后者不会删除记录。

学海无涯苦作舟

Android成长录.jpg