Julia EvansApr 17, 2024
a git cheat sheet
Show threadJulia Evans

really appreciated everyone's suggestions on the previous thread! https://social.jvns.ca/@b0rk/112276852440106066

I only included things that I actually do in the cheat sheet (with a couple of exceptions like `git push -u`, which I only don't use because I have `push.autoSetupRemote true` configured) but there are a lot of other useful-looking tips in that thread that I don't personally use

Julia Evans (@[email protected])

Attached: 1 image working on a draft of a git cheat sheet, what's missing? most interested in relatively "basic" things in git that you always forget how to do. Right now I think the push/pull section is by far the weakest

Mastodon
Apr 17, 2024 at 7:36pmWeb
Show threadJulia EvansApr 17, 2024
the only other things in this cheat sheet that I personally don't use are `git switch` and `git restore`, which I actually think seem like great choices (the fact that `git checkout THING` just GUESSES if you want to switch to a branch or restore an old version of the file is kind of scary! git switch doesn't do that! and git checkout's syntax is just really weird!), but I'm used to `git checkout` and it doesn't cause me a lot of problems so I haven't been motivated to change my ways
Show threadGraham Sutherland / PolynomialApr 17, 2024

@b0rk

> so I haven't been motivated to switch

I see what you did there

Show threadBill RickerApr 17, 2024
@gsuberland @b0rk
😁 👍
I am going to try (to) `switch`.
It sounds sound.
Show threadPeter BautistaApr 17, 2024
@b0rk I just made the turn to git switch in the last 6 months or so. Old habits are hard to kill, but what motivated me is writing a CLI tool for my team that does some git stuff, and I wanted it to be very transparent about what it did so I have it print out what it is doing, and so went with "switch." Not that people actually pay any attention to the tool's output anyway, but I like to pretend people read and that I'm being helpful 🙂
Show threadJordanApr 17, 2024
@b0rk This has been my experience too. “git-checkout does seven different things, it stinks” “okay, we’ve made dedicated commands for all the things you used to use checkout for!” “…oh, turns out I learned the seven things and breaking those habits would be hard”
Show threadDerPumu (he/him)Apr 17, 2024
@b0rk I'm at `git switch -c` sometimes, but git checkout for everything else. Also, `switch -c` is often baked into some alias as in the projects I work on, there tends to be some common prefix to most of my branch names.
Show thread9Lukas5 🚂 🐧Apr 17, 2024
@b0rk These are actually the two commands I immediately switched to, when they were introduced.
Can't even remember when I used checkout the last time 🤔🤗
Show threadGavin MastersonApr 18, 2024
@9Lukas5 @b0rk Same here.
Show threadEric CarrollApr 17, 2024
@b0rk TIL git restore
Show thread_L4NyrlfL1I0Apr 17, 2024

@b0rk It's the same for me.

Even moreso that I have a convenient alias 'co' for it (and 'ci' for commit), and I would need to figure out similarly short aliases for switch and restore (sw and rs maybe?)

Show threaddadeApr 17, 2024

@b0rk I use git switch -C mybranch to automatically switch to the branch and reset it so that it's current. But when I want to reset a file back to what's in the repo, git checkout -- /path/to/file.

Guess I only made it halfway to the less overloaded commands 😂

Show threaderi!Apr 17, 2024

@dade
That's the opposite of what I do. I use restore because git warned me to do so when I used the usual checkout. However creating or changing braches I still do with checkout   

When ever I have to push or pull I do that with remote and branch. I stopped using git push -u, as it made it too easy for me to keep pushing to wrong branches, like main in stead of feature or stupid stuff like that.
@b0rk

Show threadHayden StainsbyApr 17, 2024

@b0rk I learnt about git switch from that previous thread!

I’ve adopted it myself now, because if I’m ever working with a fit newby, it’s going to be much easier to explain.

Also I feel that if git can improve, then so can I!

Show threadShraddhaApr 17, 2024
@b0rk Ditto!
Show threadAlessandro ReApr 17, 2024
@b0rk I've been using switch and restore for a while now, and I now use checkout only to grab files from other commits. The main reason for me to switch was: they are more expressive and since I often had to explain to people how to git, I wanted te help others understand by using clearer commands. Not sure if that worked out, but I'm not going back.
Show threadrobinmApr 17, 2024
@b0rk Am-I blind or is `git bisect` missing (I would have expected to find it in the archeology section)? Other than that it's a fantastic cheat sheet.
Show threadJulia EvansApr 17, 2024
@robinm i don’t really use bisect so i left it out
Show threadMatthiasApr 18, 2024
@b0rk @robinm I never used it either, until I did. Once you‘ve seen the magic, you can’t imagine life without it. 😉
Show threadMatthiasApr 18, 2024
@b0rk @robinm Here’s what made it „click“ for me: had a bug in a big festure branch, wrote a passing test on main and rebased feature to main to get a failing test on feature. Now I could just run a single command to identify the bug automatically.
Show threadMonospace MentorApr 18, 2024
@b0rk I’m getting used to this happening to me more and more. The old process is ingrained in muscle memory so much that the new and improved one remains unused even after I finally become aware that it exists.
Show threadAaron Brick — אהרן בריקApr 17, 2024

@b0rk Great work.

Down the road, I hope to find a git glossary that explains terms like "stage", "rebase", "tracking", and being "in" a branch.

Show threadMarcin Juszkiewicz 🙃Apr 17, 2024
@b0rk `git commit -m "message" -m"another line" -m"yet another line"` rocks.
Show threadFarce MajeureApr 17, 2024
@hrw @b0rk I really like this as git commit -m "subject line of message" --edit. When my ADHD is being particularly obnoxious I'm fairly likely to lose track of what I was working on and in which window if I'm interrupted, and when I find it again it's nice to have it tell me what I was supposed to be writing a commit message about.
Show threadMarcin Juszkiewicz 🙃Apr 17, 2024

@vathpela @b0rk Then I suggest adding "-v" to show patch in editor as well.

Allows to have a look at commit.