Programming

17418 readers

201 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Follow the programming.dev instance rules
Keep content related to programming in some way
If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev

founded 1 year ago

MODERATORS

snowe@programming.dev

Ategon@programming.dev

MaungaHikoi@lemmy.nz

566

Julia Evans' Git cheat sheet (programming.dev)

submitted 1 month ago by fool@programming.dev to c/programming@programming.dev

58 comments fedilink hide all child comments

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)

you are viewing a single comment's thread
view the rest of the comments

[–] Modern_medicine_isnt@lemmy.world 16 points 1 month ago (2 children)

Missing the "oh shit need to fix this other thing but I am in the middle of a big change,,," flow. I use git stash, but I wish I could include files that haven't been added and I wish it could be tied to the branch

[–] responsible_sith@programming.dev 6 points 1 month ago

That sounds like the perfect situation to use git worktree.

[–] nik9000@programming.dev 5 points 1 month ago

I've stopped using stash and mostly just commit to my working branch. I can squah that commit away if I want later. But we squash before merge so it doesn't tend to be worth it.

It's just less things to remember.