2

I wanted to squash few commits and I followed this question. So I did:

git reset --soft HEAD~20
git commit
git push -f

I don't know why but now my branch full of merging which wasn't before. I want to revert the git reset --soft HEAD~20 command. How can it be done?

Update

I did: git reset < commit hash before the reset: moving to HEAD~20 > then git push and I'm getting:

error: failed to push some refs to 'https://[email protected]/xxxx/xxxx.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.
Improve this question
9
  • You can try using git reflog to get the sha-1 for the commit which you want your HEAD to point to . And then its git reset --hard <commit-hash> to restore your branch back to that commit.
    – Dev-vruper
    Commented Feb 10, 2021 at 13:47
  • why i need the "--hard" ? do i need to git push to also ?
    – user63898
    Commented Feb 10, 2021 at 13:50
  • If you had any local changes and you don't want those changes again in your repo, you can use --hard option . It just brings the repo back to a state it was at the specified commit.
    – Dev-vruper
    Commented Feb 10, 2021 at 13:53
  • 1
    Did resetting to that hash in the reflog solve your initial issue ? If so, you can mark @meshkati's answer as accepted.
    – LeGEC
    Commented Feb 10, 2021 at 14:00
  • 1
    FYI, don't forget to prefer --force-with-lease whenever you can...
    – Philippe
    Commented Feb 10, 2021 at 14:02

1 Answer 1

Reset to default
2

Run:

git reflog

It will show you something like this:

0475497 (HEAD -> master) HEAD@{0}: reset: moving to HEAD~20
ab155bc HEAD@{1}: commit: commit before reset
5da1f69 HEAD@{2}: commit: commit message
c2d9604 HEAD@{3}: commit: commit message
.
.
.

Then you can checkout or reset to the commit before reset, by using its commit hash ( in the above example, it's ab155bc )

Improve this answer
1
  • so to do : git reset ab155bc
    – user63898
    Commented Feb 10, 2021 at 13:48

Not the answer you're looking for? Browse other questions tagged or ask your own question.