Comment by spokaneplumb

Comment by spokaneplumb 2 days ago

4 replies

View on Hacker News

I've been using Git for almost 15 years, and have twice built programs/products that use Git internally to achieve certain results (that is, the program/product itself uses Git for things, not just using Git to manage the source code for the program/product) and... sometimes before doing something a little gnarly in Git I'll still just do "cp -R .git ../git-backup" or something like that, so I can replace my entire .git dir with an older copy if I screw it up too bad. It's a ton faster than figuring out the right way to un-fuck any particular operation or set of operations.

fragmede 2 days ago

Reflog is your friend.

    git break-my-shit
    git reflog
        ... output saying where you were before things broke
        ... grab the good commit sha
    git reset --hard good_commit_sha_from_reflog
Reply View 3 replies
  • spokaneplumb 14 hours ago

    The copy-the-.git-dir trick works for worse issues than can be solved with a single reset --hard. Damn near anything, really, as long as you haven't touched any remotes. It also works if you don't remember/understand how you broke it, where it's broken, or which state you need to try to reset to.

    Reply View 0 replies
  • compiler-guy a day ago

    And yet up above we have others recommending to never, ever, use `git reset --hard ...`.

    Reply View 1 reply