←back to thread

Oh Shit, Git?

(ohshitgit.com)
464 points Anon84 | 5 comments | 16 Jan 25 18:24 UTC | HN request time: 0s | source
Show context
frakt0x90 ◴[16 Jan 25 21:11 UTC] No.42730958[source]▶
I'm not proud of it, but my #1 "Oh shit" git operation is to just delete my local repo, reclone, and reapply the changes. Works really well for me 95% of the time. The rest I ask dev ops guy to help.
replies(3): >>42731034 #>>42731267 #>>42736129 #
wruza ◴[16 Jan 25 21:19 UTC] No.42731034[source]▶
This should be a built-in

  git unshit
Or

  git add --unshit -f ~HEAD^^
If you’re using git version <= 2.844.
replies(1): >>42732154 #
1. maleldil ◴[16 Jan 25 23:14 UTC] No.42732154[source]▶
Jujutsu has `jj undo`, but which undoes whatever was your last jj command, regardless of what it was. It makes much more confident to do an operation I'm uncertain of. And if I regret something many actions down the line, you have `jj op log` (a better reflog).
replies(2): >>42733795 #>>42742042 #
2. zahlman ◴[17 Jan 25 03:30 UTC] No.42733795[source]▶
If you `jj undo` a second time, does it redo (undoing the undo), or does it back up another step?
replies(1): >>42742418 #
3. blharr ◴[17 Jan 25 19:06 UTC] No.42742042[source]▶
Such a simple operation, but it'd probably fix 95% of problems I've had with git.

"Uh oh, I tried to checkout a branch from remote by doing `git checkout origin/some-branch` instead of `git checkout some-branch` and made a couple source changes. Now I'm in detached head state. What is detached head ? I have to stash my revisions? Can I make a new branch with the same name or do I need to delete the origin/some-branch that I'm on?"

When you could be able to just revert the "operation" and check out the correct branch, that's amazing.

4. steveklabnik ◴[17 Jan 25 19:42 UTC] No.42742418[source]▶
It redos, there's discussion about if and how this should change: https://github.com/jj-vcs/jj/issues/3700
replies(1): >>42746286 #
5. stouset ◴[18 Jan 25 06:14 UTC] No.42746286{3}[source]▶
For background, this is because the `undo` itself is an operation pushed onto the top of the stack. It is a little counterintuitive.