What is the difference between git reset and git revert?

Question

Hi I am a newbie to git and I don't understand what is the basic difference between git reset and git revert. Does git revert reverts the merge being pushed ?

Answer 1

As far as I know, they are doing totally different thing.

git revert aimed to revert effects of previous commit. For example,

A <- B <- C 
          ^ HEAD

If I found B I committed before is wrong, and I want to "undo" its change, git-revert-ing B will cause:

A <- B <- C <- B'
               ^ HEAD

for which B' is reversing the change done in B.

git reset is more straight-forward, it is simply setting the HEAD to a certain commit,

A <- B <- C 
          ^ HEAD

git-reset-ting to B will give you

A <- B <- C 
     ^ HEAD

Answer 2

git revert: Undoes a change part of a commit to the local/origin repo by creating a new commit.

command: git revert <id>

git reset: Git reset will delete/undo changes which are committed in local repo. It undoes changes by 3 ways, –soft, –mixed, –hard. Where mixed is the default value.

Working Dir (coding ) -> Staging Area(Index) -> local Repo (git push)

git reset –soft/mixed/hard –HEAD~N -> mixed is default

git reset --soft HEAD~N   # will move file/changes  from local commit to staging area
git reset --mixed HEAD~N  #will move file/changes  from local commit to working directory
git reset --hard HEAD~N  #will delete file /changes from working directory