568
Julia Evans' Git cheat sheet
(programming.dev)
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)
In recent git versions (>2.23),
git restoreandgit restore --stagedare the preferred ways to discard changes in the working tree (git checkout -- .) and staged changes (git reset --) respectively.Huh, TIL.
To be fair,
git switchwas also derived from the features ofgit checkoutin >2.23, but likegit restore, the manual page warns that behavior may change, and neither are in my muscle memory (lmao).I'll probably keep using checkout since it takes less kb in my head. ~~Besides, we still have to use checkout for checking out a previous commit, even if I learn the more ergonomically appropriate
switchandrestore.~~ No deprecation here so...edit: maybe I got that java 8 mindset
edit 2: Correction --
git switch --detachchecks out previous commits. Git checkout may only be there for old scripts' sake, since all of its features have been split off into those two new functions... so there's nothing really keeping me fromswitch.git switch works on commits too. I don't think you have to use checkout anymore.
Oh, you're right. You just pass the
-ddetach flag. I stand corrected!