GitHub Desktop or Git CLI?

hypnotic_nerd@programming.dev to Programmer Humor@programming.dev – 484 points –
159

You are viewing a single comment

I don't understand git anyway

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

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

:-D

Nah, rebase -i, squash, fsck and reflog

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

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

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)

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.

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)?

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

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.

  • 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.