| #include <stdio.h> | |
| #include <stdlib.h> | |
| #include <stdint.h> | |
| #ifdef _MSC_VER | |
| #include <intrin.h> | |
| #pragma optimize("gt",on) | |
| #else | |
| #include <x86intrin.h> | |
| #endif |
Git is hard: screwing up is easy, and figuring out how to fix your mistakes is fucking impossible. Git documentation has this chicken and egg problem where you can't search for how to get yourself out of a mess, unless you already know the name of the thing you need to know about in order to fix your problem.
So here are some bad situations I've gotten myself into, and how I eventually got myself out of them in plain english*.
| ### Keybase proof | |
| I hereby claim: | |
| * I am td0 on github. | |
| * I am tadho (https://keybase.io/tadho) on keybase. | |
| * I have a public key ASCgZiX6bUnB5fSivF_WeVdkrNRVWx8tx8cfhvbhPFGhXAo | |
| To claim this, I am signing this object: |
| div.window-title, div.panel-header div.title, a.editor-status-mode, | |
| div.results-group, span.quick-open-entry-description>span.monaco-highlighted-label:first-child, | |
| .input, div.column.when span, | |
| .Equinusocio-vsc-material-theme-themes-Material-Theme-Palenight-json .mtk12, | |
| .Equinusocio-vsc-material-theme-themes-Material-Theme-Palenight-json .mtk9, | |
| .Equinusocio-vsc-material-theme-themes-Material-Theme-Palenight-json .mtk4, | |
| .Equinusocio-vsc-material-theme-themes-Material-Theme-Palenight-json .mtk3.mtki.detected-link, | |
| .Equinusocio-vsc-material-theme-themes-Material-Theme-Palenight-json span.mtk11.mtki, | |
| .Tyriar-theme-sapphire-theme-bright-json .mtk6, | |
| .zhuangtongfa-Material-theme-themes-OneDark-Pro-json .mtk6, |
| defaults write com.apple.PowerChime ChimeOnAllHardware -bool true; | |
| open /System/Library/CoreServices/PowerChime.app |
| ;SMBDIS.ASM - A COMPREHENSIVE SUPER MARIO BROS. DISASSEMBLY | |
| ;by doppelganger (doppelheathen@gmail.com) | |
| ;This file is provided for your own use as-is. It will require the character rom data | |
| ;and an iNES file header to get it to work. | |
| ;There are so many people I have to thank for this, that taking all the credit for | |
| ;myself would be an unforgivable act of arrogance. Without their help this would | |
| ;probably not be possible. So I thank all the peeps in the nesdev scene whose insight into | |
| ;the 6502 and the NES helped me learn how it works (you guys know who you are, there's no |
| #!/bin/sh | |
| # Command Line Tools | |
| xcode-select --install | |
| # Sudo | |
| sudo -v | |
| while true; do sudo -n true; sleep 60; kill -0 $$ || exit; done 2>/dev/null & | |
| # Homebrew |
| git reset --hard <old-commit-id> | |
| git push -f <remote-name> <branch-name> |
| Undo a commit and redo | |
| $ git commit -m "Something terribly misguided" (1) | |
| $ git reset --soft HEAD~ (2) | |
| << edit files as necessary >> (3) | |
| $ git add ... (4) | |
| $ git commit -c ORIG_HEAD (5) |
