How can revert a remote git repository?

Question

I clone my own repository from github to local machine, do a small change, then git push it. The git log likes this:

3: xxxxx  
2: yyyyy 
1: zzzzz

I suddenly find there is an error in commit 3, so in local repository, I do git reset 2 first, modify the file again, then git commit it. So the git log changes to this:

4: ttttt
2: yyyyy
1: zzzzz

This time when I git push origin, the git complains:

To https://github.com/NanXiao/torch.git
! [rejected]        patch-1 -> patch-1 (non-fast-forward)
error: failed to push some refs to 'https://github.com/NanXiao/torch.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.

So how can I revert the remote repository? Make the remote repository's git log like this:

4: ttttt
2: yyyyy
1: zzzzz

If you found an error in commit 3, then the correct command is `git revert 3`. If you did a `git revert 2`, then that undoes the good change `yyyyy` and leaves intact the bad change `xxxxx`. — Raymond Chen, Aug 14 '15 at 05:21
No, it isn't. Doing `git reset` will not leave you with a new commit. — Tim Biegeleisen, Aug 14 '15 at 05:31
@TimBiegeleisen: After `git reset 2`, I modify and create a new `commit`. — Nan Xiao, Aug 14 '15 at 05:35
Clean up your original question so it is unambiguous and then message me once you have done so. — Tim Biegeleisen, Aug 14 '15 at 05:35
@TimBiegeleisen: Very sorry for confusing you and Raymond. Update it, please refer, thanks! — Nan Xiao, Aug 14 '15 at 05:47
possible duplicate of [Cannot push to github - keeps saying need merge](http://stackoverflow.com/questions/10298291/cannot-push-to-github-keeps-saying-need-merge) — Raymond Chen, Aug 14 '15 at 07:31

Tim Biegeleisen · Accepted Answer · 2015-08-14T05:53:56.200

2

To recap what you actually did to your branch, you started out with this:

3: xxxxx
2: yyyyy
1: zzzzz

You decided there was a problem with commit 3 so you nuked it using git reset --hard HEAD~1, leaving you with this:

2: yyyyy
1: zzzzz

Then, you made a new commit on top of this branch:

4: ttttt
2: yyyyy
1: zzzzz

The non-fast-forward error you saw makes sense since Git has no way of simply adding commit 4 on top of the remote branch which either still ends in commit 3 or ends in another commit which someone else made on top of commit 3.

That being said, if you want to force your current branch to the repository, you can do so via:

git push origin your_branch --force

Take heed when doing a force push because it can cause problems for anyone else who is currently working with your branch.

edited Aug 14 '15 at 05:53

answered Aug 14 '15 at 05:20

Tim Biegeleisen

502,043
27
286
360

I am very sorry, it is `git reset 2`. – Nan Xiao Aug 14 '15 at 05:30
1

`git push origin your_branch --force` is my need, thanks! – Nan Xiao Aug 14 '15 at 05:50
@NanXiao Yes...this is my feeling from reading your updated question. I will update my answer as well now. – Tim Biegeleisen Aug 14 '15 at 05:50
Slightly safer is `--force-with-lease` which will reject the push if somebody pushed to the branch while you weren't looking. This helps prevent accidentally reverting somebody else's work. – Raymond Chen Aug 14 '15 at 07:08

How can revert a remote git repository?

1 Answers1