Oh shit, I accidentally `git reset HEAD~1` and moved the last commit to file dif...

julienb_sea on Jan 16, 2025 | parent | context | favorite | on: Oh Shit, Git?

Oh shit, I accidentally `git reset HEAD~1` and moved the last commit to file diffs, which was a merge to master, and my file diff now is both the last branch merge and everything I've done in the last 8hrs. I did this once and it was a gigantic PITA to undo, if anyone has any hot tips for that particular idiocy...

Am4TIfIsER0ppos on Jan 17, 2025 [–]

`git reset` again to move to the right commit