backhdlp, (edited )
@backhdlp@lemmy.blahaj.zone avatar

I don’t understand git anyway

fckreddit,

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

Valmond,

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

:-D

muix, (edited )

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

>:-D

Valmond,

push origin head

^^

xmunk,

Nah, rebase -i, squash, fsck and reflog

Valmond,

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,

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

rikudou, (edited )
@rikudou@lemmings.world avatar

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

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

xmunk,

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,

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.

traches,

https://imgs.xkcd.com/comics/git_2x.png

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

pimeys,

Magit

akkajdh999,

fugitive

RePierre,

I was looking for someone to mention Magit. It just rocks!

h_a_r_u_k_i,
@h_a_r_u_k_i@programming.dev avatar

This + org-mode are enough for me to switch to Emacs.

  • All
  • Subscribed
  • Moderated
  • Favorites
  • programmer_humor@programming.dev
  • localhost
  • All magazines
  • Loading…
    Loading the web debug toolbar…
    Attempt #