552
git workflow (lemmy.ml)
top 39 comments
sorted by: hot top controversial new old
[-] Limonene@lemmy.world 24 points 6 days ago

I like git add because then you can do git diff --staged

[-] davetapley@lemmy.world 7 points 6 days ago

Yes yes, combined with git add -P makes small, meaningful commits so much easier.

[-] fossphi@lemm.ee 6 points 6 days ago
[-] davetapley@lemmy.world 2 points 6 days ago

Alas I sold my soul to VSCode a long time ago.

Also, ew, emacs 😝

[-] fossphi@lemm.ee 2 points 6 days ago

Oh come on, try it out! I know some people who use emacs only for magit. It really is that good.

A few of them slowly became full on emacs users...

... What's git merge look like?

[-] zqwzzle@lemmy.ca 18 points 6 days ago
[-] childOfMagenta@lemm.ee 2 points 6 days ago* (last edited 6 days ago)

... incident

[-] synae@lemmy.sdf.org 10 points 6 days ago

grow up, use "git add -p" and craft perfect artisanal commits

[-] NigelFrobisher@aussie.zone 5 points 6 days ago

Every bloody time, though this case the people not on the Ryanair flight may be the lucky ones. If only git was the most unnecessarily arcane thing devs have to/choose to work with.

[-] Comtief@lemm.ee 7 points 6 days ago

i'm sure there are much better tools available, but i'm just used to git gui where rescan, commit and push all are in order.

[-] callmepk@lemmy.world 4 points 6 days ago
[-] thirteene@lemmy.world 3 points 5 days ago

I set this up for seamless commits:

function gao() {
     git add .
     git commit -a -m "$*"
     git push origin `git rev-parse --abbrev-ref HEAD`
 }

Usage: gao fixing a typo

[-] tatterdemalion@programming.dev 4 points 6 days ago

Use Jujutsu jj and you won't have this problem

[-] lobut@lemmy.ca 4 points 6 days ago

lazygit is pretty cool too.

[-] anti_antidote@lemmy.zip 2 points 6 days ago

Jujutsu time 😁

[-] DScratch@sh.itjust.works 52 points 1 week ago

Be a man.

‘git commit -am “changes”’

[-] KindaABigDyl@programming.dev 5 points 6 days ago

And any project worth their salt will reject it for two reasons:

  1. Unclear message/changes (potentially too many changes at once)
  2. Not signed
[-] wise_pancake@lemmy.ca 5 points 6 days ago

I’ve got signing auto enabled though

[-] JiminaMann@lemmy.world 2 points 6 days ago

Doesn't work for me idk why, it'll ignore the message, and i have to commit again before i can push

[-] drew_belloc@programming.dev 37 points 1 week ago

At this point just create a script or alias called "fuckthis" that does that and then push direct to main

[-] DScratch@sh.itjust.works 35 points 1 week ago

PR reviews take the most time, eliminating those saved us loads of time.

QA were also bogging us down, axed them too. Now we’re flying.

The Social Security Infrastructure rebuild should be done in a matter of weeks! At least that’s what Copilot says.

[-] Vittelius@feddit.org 1 points 5 days ago

That's how you get a Boing

[-] jol@discuss.tchncs.de 26 points 1 week ago

I have auto save on. A cron job running every minute with just git add . && git commit - m "wip"

[-] magic_lobster_party@fedia.io 11 points 6 days ago

&& git push --force

[-] DannyBoy@sh.itjust.works 19 points 6 days ago

Have the name of the alias be "gti" or "gut"

[-] SexualPolytope@lemmy.sdf.org 7 points 6 days ago* (last edited 6 days ago)
alias {gti,gut}='git commit -am "changes" && git push -f'
[-] synae@lemmy.sdf.org 5 points 6 days ago* (last edited 6 days ago)

I have about a dozen aliases of various mistypings of "git". Somehow I still hit unaliased typo once in a while

[-] heavydust@sh.itjust.works 10 points 1 week ago

Real 10x vibe developers use https://jj-vcs.github.io/jj/latest/, no need to add or commit!

[-] drew_belloc@programming.dev 7 points 1 week ago

So is easier to push direct to prod? Hell yeah!

[-] heavydust@sh.itjust.works 4 points 6 days ago

With jj you're always the prod whatever you do! Feel free to break that fucking CI.

[-] drew_belloc@programming.dev 1 points 6 days ago

Gonna try it out non my next college project

[-] heavydust@sh.itjust.works 3 points 6 days ago* (last edited 6 days ago)

You may or may not be joking, but jujutsu is the first true git alternative that I'm actively trying on small projects at work. The command-line is great, and I can still interact with other devs without breaking stuff.

Buuuuuuuut if you're a CS student, don't bother, it's weird and you should focus on git which is used everywhere. You can get free GUI clients like Sublime Merge or SmartGit to ease the pain. I've been hating git since the beginning, but it's the least worst SCM right now. Learn the command-line, but I have never done that since it's infuriating, and that's why I've been using GUIs since, holy shit, Wikipedia says 2005.

[-] drew_belloc@programming.dev 2 points 6 days ago

Is just half a joke, i do like to try it out a lot of different things, be whatever it may be, so i'm totally finding a project to use this, and also i don't really like to use a GUI for git simce most of my workflow happens in a terminal, and even tho i do like how git works i am open to try something new and see if it's better for me or not

[-] heavydust@sh.itjust.works 2 points 6 days ago

Try Mercurial too. Both projects started at the same time but git won. Mercurial is equivalent but its interesting.

[-] drew_belloc@programming.dev 1 points 6 days ago

Sure, thanks for the recomendation

this post was submitted on 09 Apr 2025
552 points (98.8% liked)

Programmer Humor

22444 readers
1271 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 2 years ago
MODERATORS