上次學(xué)習(xí)了git reset，是用來回退某個版本的，在回退的時候commit提交日志也會回退，這次的git revert正好相反，以一次新的提交來作為回退的方式，與指定回退的版本相互抵消來做到撤銷。

先看一下用法：

git revert commitId

用來指定撤銷哪次的commit，commitId就是日志中commit后面的40位十六進(jìn)制id

做一下比較

reset:

[lkc@lkcdeMacBook-Pro:] ~/Desktop/Code/gitSample $ git log -2
commit 850770dd060dc59ee78ab5223ff501563aa67736
Author: xxx <xxx.com>
Date:   Wed Jun 7 10:08:14 2017 +0800

    del b

commit e5ef718d32687acd3ad541f5eae454c513390acb
Author: xxx <xxx.com>
Date:   Wed Jun 7 10:07:41 2017 +0800

    b
[lkc@lkcdeMacBook-Pro:] ~/Desktop/Code/gitSample $ git reset --soft  850770dd060dc59ee78ab5223ff501563aa67736

[lkc@lkcdeMacBook-Pro:] ~/Desktop/Code/gitSample $ git log -1
commit e5ef718d32687acd3ad541f5eae454c513390acb
Author: xxx <xxx.com>
Date:   Wed Jun 7 10:07:41 2017 +0800

    b    

可以看到reset直接把回退版本之前的版本全都撤銷掉了;

revert:

[lkc@lkcdeMacBook-Pro:] ~/Desktop/Code/gitSample $ git log -1
commit 79689a057631404be86eaee7e2f12c98910ffda3
Author: xxx <xxx.com>
Date:   Wed Jun 7 10:14:50 2017 +0800

    ss
[lkc@lkcdeMacBook-Pro:] ~/Desktop/Code/gitSample $ git revert 79689a057631404be86eaee7e2f12c98910ffda3
[master ccf39cc] Revert "ss"
 2 files changed, 1 insertion(+)
 create mode 100644 a.txt
 create mode 100644 b.txt

 [lkc@lkcdeMacBook-Pro:] ~/Desktop/Code/gitSample $ git log -2
 commit ccf39cc1b98b2376ba1468698f1a2976294d9fca
 Author: xxx <xxx.com>
 Date:   Wed Jun 7 10:15:03 2017 +0800

     Revert "ss"

     This reverts commit 79689a057631404be86eaee7e2f12c98910ffda3.

 commit 79689a057631404be86eaee7e2f12c98910ffda3
 Author: xxx <xxx.com>
 Date:   Wed Jun 7 10:14:50 2017 +0800

     ss     

可以看到,revert把撤銷的這次作為了一次新的提交,而且要撤銷的那次還保留著;
而且在我看來,reset是回退到某個版本之前,revert是單純的撤銷某次提交,一個偏階段,一個偏單一.

后記

在我刪除本地文件后提交遠(yuǎn)程倉庫時出現(xiàn)了如下錯誤:

[lkc@lkcdeMacBook-Pro:] ~/Desktop/Code/gitSample $ git push origin master
To ssh://git.sankuai.com/~zhangjunbo/test.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://git@git.xxx.com/~xxx/test.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.  

讀一下發(fā)現(xiàn)是遠(yuǎn)程的代碼跟我提交的不一樣，拒絕覆蓋，當(dāng)然解決的方法就是利用

git rm <file>

這條命令來刪掉本地沒有的文件,然后再次提交即可.

[lkc@lkcdeMacBook-Pro:] ~/Desktop/Code/gitSample $ git rm b.txt
rm 'b.txt'
[lkc@lkcdeMacBook-Pro:] ~/Desktop/Code/gitSample $ git st
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

  deleted:    b.txt

[lkc@lkcdeMacBook-Pro:] ~/Desktop/Code/gitSample $ git ci -m "del b"
[master 850770d] del b
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 b.txt
[lkc@lkcdeMacBook-Pro:] ~/Desktop/Code/gitSample $ git st
On branch master
nothing to commit, working tree clean

當(dāng)然了下次在本地刪除文件時還是直接使用git rm 比較好,這樣避免了這種的錯誤.