486
you are viewing a single comment's thread
view the rest of the comments
[-] backhdlp@lemmy.blahaj.zone 37 points 9 months ago* (last edited 9 months ago)

I don't understand git anyway

[-] fckreddit@lemmy.ml 70 points 9 months ago

Well, you learn four commands and hope for the best.

[-] Valmond@lemmy.mindoki.com 17 points 9 months ago

fetch, reset --hard, checkout -b and cherry-pick?

:-D

[-] xmunk@sh.itjust.works 13 points 9 months ago

Nah, rebase -i, squash, fsck and reflog

[-] rikudou@lemmings.world 11 points 9 months ago* (last edited 9 months ago)

Must be an interesting work if you never add, commit or push.

Edit: How the hell did you get the repo without clone?

[-] xmunk@sh.itjust.works 11 points 9 months ago

Pshaw, real programmers write out the contents of .git by hand.

(Also, it was a joke, the last two commands I listed are ones you'll ideally never need in your life)

[-] overcast5348@lemmy.world 3 points 9 months ago

I was scared of reflog too. Had to use it for the first time recently after I accidentally'd a branch that I hadn't pushed to remote yet. I was so glad that I could recover it all in <5 commands.

[-] Valmond@lemmy.mindoki.com 5 points 9 months ago

reflog saved my life once after a stupid misshap.

All rebase are belong to us (onto, rebase, and ofc interactive) but what's fsck (I don't squash personally)?

[-] xmunk@sh.itjust.works 4 points 9 months ago

Fsck is File System Check - realistically you should never need to use it.

[-] muix@infosec.pub 10 points 9 months ago* (last edited 9 months ago)

More like clone, pull, commit, and push --force

>:-D

[-] Valmond@lemmy.mindoki.com 3 points 9 months ago

push origin head

^^

[-] traches@sh.itjust.works 53 points 9 months ago

Title text: If that doesn't fix it, git.txt contains the phone number of a friend of mine who understands git. Just wait through a few minutes of 'It's really pretty simple, just think of branches as...' and eventually you'll learn the commands that will fix everything.

[-] popcar2@programming.dev 10 points 9 months ago
  • git pull

  • git add *

  • git commit -m "Some stuff"

  • git push

And occasionally when you mess up

  • git reflog

  • git reset HEAD@{n} (where n is where you wanna roll back to)

And occasionally if you mess up so hard you give up

  • git reset --hard origin/main

And there you go. You are now a master at using git. Try not to mess up.

this post was submitted on 13 Dec 2023
486 points (94.2% liked)

Programmer Humor

19276 readers
1208 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago
MODERATORS