I'm not clear on how git revert works. For example, I want to revert to a commit six commits behind the head, reverting all the changes in the intermediary commits in between.
Say its SHA hash is 56e05fced214c44a37759efa2dfc25a65d8ae98d. Then why can't I just do something like:
git revert 56e05fced214c44a37759efa2dfc25a65d8ae98d
If you want to commit on top of the current HEAD with the exact state at a different commit, undoing all the intermediate commits, then you can use reset to create the correct state of the index to make the commit.
# Reset the index and working tree to the desired tree
# Ensure you have no uncommitted changes that you want to keep
git reset --hard 56e05fced
# Move the branch pointer back to the previous HEAD
git reset --soft "HEAD@{1}"
git commit -m "Revert to 56e05fced"
git reset --hard 56e05fced as the first command, and then skip the final git reset --hard? –
Noose Untracked Files in the working tree. However looking at the history I could see that those files did have a corresponding delete commit in that "Revert to SHA" commit. So after git reset --hard at the end, you can do git clean -f -d to clean up any untracked files that lingered about. Also, thank you so much this helped me solve a crisis! –
Brody git reset --soft HEAD@{1} unconditionally? I mean always with a value of 1? –
Gymno git reset 56e05fced adds another entry to the reflog (run git reflog), so git reset --soft HEAD@{1} simply moves the pointer back to the HEAD prior to calling git reset 56e05fced. Using a higher number (e.g. git reset --soft HEAD@{2}) would append the new commit on a previous commit. That is, increasing the number would essentially throw away N-1 commits where N is the number you replace 1 with. –
Rigadoon git clean -f -d to clean up any untracked files, otherwise the process is not fully completed. please update your answer –
Scorpio HEAD@{1} should be quoted as 'HEAD{@1}' otherwise, it won't work for me (possibly every zsh users) –
Puffy clean should no longer be needed. –
Chromosome git reset --hard. You should rather use git checkout <revision-id>. This way you disconnect from the branch. –
Ratiocinate What git-revert does is create a commit which undoes changes made in a given commit, creating a commit which is reverse (well, reciprocal) of a given commit. Therefore
git revert <SHA-1>
should and does work.
If you want to rewind back to a specified commit, and you can do this because this part of history was not yet published, you need to use git-reset, not git-revert:
git reset --hard <SHA-1>
(Note that --hard would make you lose any non-committed changes in the working directory).
By the way, perhaps it is not obvious, but everywhere where documentation says <commit> or <commit-ish> (or <object>), you can put an SHA-1 identifier (full or shortened) of commit.
git push -f, but Be Warned that this could possibly unintentionally delete other users' commits, and if not delete new commits, then it will force other users to resynchronize their work with the reset branch, so make sure this is OK with your collaborators first. –
Ordinary git revert <SHA-1> in the first part of this answer is the cleanest and easiest solution. It has the benefit of showing a clear history with the additional revert commits showing up as normal too. No need to force push either. –
Sandhurst The best way to rollback to a specific commit is:
git reset --hard <commit-id>
Then:
git push <reponame> -f
push -f can destroy history. However, sometimes this is what you want :) –
Burnsed It reverts the said commit, that is, adds the commit opposite to it. If you want to checkout an earlier revision, you do:
git checkout 56e05fced214c44a37759efa2dfc25a65d8ae98d
git branch you will clearly see it. You can do for instance git checkout -b mybranch 56e05 to get it with branch. –
Crackerjack Updated:
If there were no merge commits in between, this answer provides a is simpler method: https://mcmap.net/q/11819/-how-do-i-revert-a-git-repository-to-a-previous-commit
But if there was one or more merge commits, that answer won't work, so stick to this one (that works in all cases).
Original answer:
# Create a backup of master branch
git branch backup_master
# Point master to '56e05fce' and
# make working directory the same with '56e05fce'
git reset --hard 56e05fce
# Point master back to 'backup_master' and
# leave working directory the same with '56e05fce'.
git reset --soft backup_master
# Now working directory is the same '56e05fce' and
# master points to the original revision. Then we create a commit.
git commit -a -m "Revert to 56e05fce"
# Delete unused branch
git branch -d backup_master
The two commands git reset --hard and git reset --soft are magic here. The first one changes the working directory, but it also changes head (the current branch) too. We fix the head by the second one.
git revert 56e05fce..HEAD because it's just one commit –
Glendaglenden git submodule update --init --recursive after git reset --hard 56e05fce. –
Bucolic If your changes have already been pushed to a public, shared remote, and you want to revert all commits between HEAD and <sha-id>, then you can pass a commit range to git revert,
git revert 56e05f..HEAD
and it will revert all commits between 56e05f and HEAD (excluding the start point of the range, 56e05f).
--no-edit option to avoid having to make individual commit messages, or you can use --no-commit to commit the reversions all at once. –
Ordinary ~/.gitconfig under the aliases section: rollback = "!git revert --no-commit $1..HEAD #" - so now I can just intuitively do $ git rollback a1s2d3 –
Minnick error: Commit 6b3d9b3e05a9cd9fc1dbbebdd170bf083de02519 is a merge but no -m option was given. fatal: revert failed - any suggestions? I tried adding -m but wasn't quite sure how that would work with this –
Miso This is more understandable:
git checkout 56e05fced -- .
git add .
git commit -m 'Revert to 56e05fced'
And to prove that it worked:
git diff 56e05fced
56e05fced, it won't be staged by doing git checkout 56e05fced -- . –
Noose 56e05fced , like a git reset --hard or a git revert would. You really want to use those commands if you actually want to restore the state of 56e05fced, not git checkout. –
Ordinary Should be as simple as:
git reset --hard 56e05f
That'll get you back to that specific point in time.
This might work:
git checkout 56e05f
echo ref: refs/heads/master > .git/HEAD
git commit
git reset --hard 56e05f, except this is less safe and more hacky. You might as well use Charle's solution or Jakub's solution. –
Ordinary © 2022 - 2024 — McMap. All rights reserved.