this post was submitted on 30 Apr 2026
522 points (99.2% liked)

Programmer Humor

31311 readers
1347 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
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
522
Please let me squash a merge commit (sh.itjust.works)
submitted 1 week ago by jxk@sh.itjust.works to c/programmer_humor@programming.dev
50 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] psycotica0@lemmy.ca 5 points 1 week ago* (last edited 1 week ago)

Yeah, I'm with you. I mean, git isn't magic. You "can" squash anything, including a merge commit, by just being at the end result, running git reset <commit you want to be squashed off of> and then running a manual git add and commit there. That's basically all a squash is.

But what you'll be left with us a single commit that contains all of the code from the branch you're squashing and also all the code pulled in from every branch you merged, all written as though it all came from this one commit. And maybe that's what you want? But it feels like also maybe it's not?