Undo git pull how to bring repos to old state

Question

Is there any way to revert or undo git pull so that my source repos will come to old state that was before doing git pull   I want to do this because it merged some files which I didn t want to do so  but only merge other remaining files  So  I want to get those files back  is that possible   EDIT  I want to undo git merge for clarification  After seeing some answers  I did this   git reflog bb3139b    HEAD  0   pull   Fast forward 01b34fa    HEAD  1   clone  from    name      Now  what should I do   Doing git reset --hard  is OK   I don t want to screw it again  so asking for detailed steps

User · Accepted Answer

Running git pull performs the following tasks  in order    git fetch  git merge   The merge step combines branches that have been setup to be merged in your config  You want to undo the merge step  but probably not the fetch  doesn t make a lot of sense and shouldn t be necessary      To undo the merge  use git reset --hard to reset the local repository to a previous state  use git-reflog to find the SHA-1 of the previous state and then reset to it   Warning  The commands listed in this section remove all uncommitted changes  potentially leading to a loss of work   git reset --hard   Alternatively  reset to a particular point in time  such as   git reset --hard master   10 minutes ago

User · Answer

it works first use  git reflog  find your SHA of your previus state and make  HEAD  1  is an example   git reset --hard HEAD  1

User · Answer

Same as jkp s answer  but here s the full command   git reset --hard a0d3fe6   where a0d3fe6 is found by doing  git reflog   and looking at the point at which you want to undo to

User · Answer

Try run git reset --keep HEAD  1

User · Answer

If there is a failed merge  which is the most common reason for wanting to undo a git pull  running git reset --merge does exactly what one would expect  keep the fetched files  but undo the merge that git pull attempted to merge  Then one can decide what to do without the clutter that git merge sometimes generates  And it does not need one to find the exact commit ID which --hard mentioned in every other answer requires

User · Answer

git pull do below operation      i  git fetch      ii  git merge   To undo pull do any operation      i  git reset --hard   --- its revert all local change also      or      ii  git reset --hard master  5 days ago    like 10 minutes ago    1 hours ago  1 days ago     to get local changes       or      iii  git reset --hard commitid   Improvement   Next time use git pull --rebase instead of git pull   its sync server change by doing   fetch  amp  merge

User · Answer

If you have gitk  try running  gitk --all from your git command line    it s simple  Just run it  select the commit you want to rollback to  right-click   and select  Reset master branch to here   If you have no uncommited changes  chose the  hard  option

User · Answer

you can do git reset --hard ORIG HEAD  since  pull  or  merge  set ORIG HEAD to be the current state before doing those actions

User · Answer

This is the easiest way to revert you pull changes      Warning      Please backup of your changed files because it will delete the newly created files and folders    git reset --hard 9573e3e0   Where 9573e3e0 is your  Commit id

User · Answer

A more modern way to undo a merge is   git merge --abort   And the slightly older way   git reset --merge   The old-school way described in previous answers  warning  will discard all your local changes    git reset --hard   But actually  it is worth noticing that git merge --abort is only equivalent to git reset --merge given that MERGE HEAD is present  This can be read in the git help for merge command   git merge --abort is equivalent to git reset --merge when MERGE HEAD is present    After a failed merge  when there is no MERGE HEAD  the failed merge can be undone with git reset --merge but not necessarily with git merge --abort  so they are not only old and new syntax for the same thing  This is why i find git reset --merge to be much more useful in everyday work

User · Answer

Suppose  COMMIT was the last commit id before you performed git pull  What you need to undo the last pull is git reset --hard  COMMIT   Bonus  In speaking of pull  I would like to share an interesting trick  git pull --rebase This above command is the most useful command in my git life which saved a lots of time  Before pushing your newly commit to server  try this command and it will automatically sync latest server changes  with a fetch   merge  and will place your commit at the top in git log  No need to worry about manual pull merge  Find details at  http   gitolite com git-pull--rebase

[git] Undo git pull, how to bring repos to old state

Examples related to git

Examples related to version-control

Examples related to git-merge