←back to thread

Oh Shit, Git?

(ohshitgit.com)
464 points Anon84 | 2 comments | 16 Jan 25 18:24 UTC | HN request time: 0.434s | source
1. julienb_sea ◴[16 Jan 25 22:24 UTC] No.42731692[source]▶
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...
replies(1): >>42737926 #
2. Am4TIfIsER0ppos ◴[17 Jan 25 14:36 UTC] No.42737926[source]▶
`git reset` again to move to the right commit