Resetting remote to a certain commit

Question

I want to discard all changes done after commit  lt commit-hash gt    So I did   git reset --hard  lt commit-hash gt    Now I want to do the same with my remote  How can I do this  I have done some commits  and pushes  after  lt commit-hash gt  and I just want to discard them all  Is just something went terribly wrong in the way and I don t want to make it worse than it is already      I basically want to rewind my origin master to  lt commit-hash gt

User · Answer

My two cents to the previous answers  if   git push --force  lt remote gt   lt the-hash gt   lt the remote branch gt    still doesn t work  you might want to edit  lt your-remote-repo gt  git config file s receive section    receive     denyNonFastforwards   true   denyNonFastforwards   false

User · Answer

Sourcetree  resetting remote to a certain commit   If you have pushed a bad commit to your remote  origin feature 1337 MyAwesomeFeature  like below picture      Go to Remotes   origin   feature   1337 MyAwesomeFeature Right click and choose  Delete origin feature 1337 MyAwesomeFeature   Or change name of it if you want a backup and skip step 4   Click  Force delete  and  OK          Select your older commit and choose  Reset current branch to this commit  Choose which mode you want to have  Hard if you don t want your last changes  and  OK         Push this commit to a new origin feature 1337 MyAwesomeFeature  Your local feature branch and your remote feature branch are now on the previous  of your choice  commit

User · Answer

Assuming that your branch is called master both here and remotely  and that your remote is called origin you could do    git reset --hard  lt commit-hash gt   git push -f origin master   However  you should avoid doing this if anyone else is working with your remote repository and has pulled your changes   In that case  it would be better to revert the commits that you don t want  then push as normal   Update  you ve explained below that other people have pulled the changes that you ve pushed  so it s better to create a new commit that reverts all of those changes   There s a nice explanation of your options for doing this in this answer from Jakub Narebski   Which one is most convenient depends on how many commits you want to revert  and which method makes most sense to you   Since from your question it s clear that you have already used git reset --hard to reset your master branch  you may need to start by using git reset --hard ORIG HEAD to move your branch back to where it was before    As always with git reset --hard  make sure that git status is clean  that you re on the right branch and that you re aware of git reflog as a tool to recover apparently lost commits    You should also check that ORIG HEAD points to the right commit  with git show ORIG HEAD   Troubleshooting   If you get a message like     remote rejected    a60f7d85 -  master  pre-receive hook declined     then you have to allow branch history rewriting for the specific branch  In BitBucket for example it said  Rewriting branch history is not allowed   There is a checkbox named Allow rewriting branch history which you have to check

User · Answer

If you want a previous version of file  I would recommend using git checkout   git checkout  lt commit-hash gt    Doing this will send you back in time  it does not affect the current state of your project  you can come to mainline     git checkout mainline  but when you add a file in the argument  that file is brought back to you from a previous time to your current project time  i e  your current project is changed and needs to be committed   git checkout  lt commit-hash gt  -- file name git add   git commit -m  file brought from previous time  git push   The advantage of this is that it does not delete history  and neither does revert a particular code changes  git revert   Check more here https   www atlassian com git tutorials undoing-changes git-checkout

User · Answer

Let s assume that your branch is called master both locally and remotely  and that your remote is called origin you could do  git reflog to get all the commit history  your commit hash has format like this  e34e1ff git reset --hard  lt commit-hash gt   git push -f origin master

User · Answer

Use the other answers if you don t mind losing local changes  This method can still wreck your remote if you choose the wrong commit hash to go back to   If you just want to make the remote match a commit that s anywhere in your local repo    Do not do any resetting  Use git log to find the commit you want to the remote to be at  git log -p to see changes  or git log --graph --all --oneline --decorate to see a compact tree  Copy the commit s hash or its tag  or the name of its branch if it s the tip  Run a command like   git push --force  lt remote gt   lt commit-ish gt   lt the remote branch gt    e g   git push --force origin 606fdfaa33af1844c86f4267a136d4666e576cdc master   or  git push --force staging v2 4 0b2 releases    I use convenient alias  git go  for viewing history as in step 2  which can be added like so       git config --global alias go  log --graph --all --decorate --oneline

User · Answer

I solved problem like yours by this commands   git reset --hard  lt commit-hash gt   git push -f  lt remote gt   lt local branch gt   lt remote branch gt

User · Answer

Do one thing  get the commit s  SHA no  such as 87c9808 and then    move yourself  that is your head to the specified commit  by doing  git reset --hard 89cef43  mention your number here   Next do some changes in a random file   so that the git will ask you to commit that locally and then remotely Thus  what you need to do now is  after applying change git commit -a -m  trial commit  Now push the following commit  if this has been committed locally  by git push origin master Now what git will ask from you is that      error  failed to push some refs to     https   github com YOURREPOSITORY AndroidExperiments 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       Thus now what you can do is   git push --force origin master   And thus  i hope it works

User · Answer

On GitLab  you may have to set your branch to unprotected before doing this  You can do this in  repo    Settings   Repository   Protected Branches  Then the method from Mark s answer works   git reset --hard  lt commit-hash gt  git push -f origin master

User · Answer

If your branch is not development or production  the easiest way to achieve this is resetting to a certain commit locally and create a new branch from there  You can use    git checkout 000000    where 000000 is the commit id where you want to go  in your problematic branch and then simply create a new branch    git remote add  name of your remote   Then you can create a new PR and all will work fine

[git] Resetting remote to a certain commit

Examples related to git