Julia Evans' Git cheat sheet - eviltoast

Git cheat sheets are a dime-a-dozen but I think this one is awfully concise for its scope.

  • Visually covers branching (WITH the commands – rebasing the current branch can be confusing for the unfamiliar)
  • Covers reflog
  • Literally almost identical to how I use git (most sheets are either Too Much or Too Little)
  • expr@programming.dev
    link
    fedilink
    arrow-up
    3
    ·
    2 months ago

    It can be nice when you successfully do a rebase (after resolving conflicts), but change your mind about the resolution and want to redo it.

    Doesn’t come up that much, but it’s been handy once or twice, for me. It’s also just nice security: no matter how I edit commits, I can always go back if I need to.