this post was submitted on 27 Jun 2024
424 points (95.5% liked)

Programmer Humor

19551 readers
819 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
[email protected]
[email protected]
[email protected]
[email protected]
424
Coomitter be like (lemm.ee)
submitted 4 months ago by [email protected] to c/[email protected]
44 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] [email protected] 104 points 4 months ago (5 children)


oh god, it's me

[–] [email protected] 85 points 4 months ago (3 children)

Senior developer tip: squash the evidence.

[–] [email protected] 28 points 4 months ago (3 children)

Principle developer tip: rewrite history to make yourself seem smarter.

Soft reset the whole branch and commit a series of atomic and semantic patches (eg separating code, test, and refactor changes) that tell a clean narrative of the changeset to reviewers, future blamers.

[–] [email protected] 3 points 4 months ago (1 children)

And then my team squashes those commits 😩

[–] [email protected] 1 points 4 months ago

Yeah it sucks. If the commits are really helpful, you can just paste the git log into the PR/MR/CR body after it's been merged

[–] [email protected] 2 points 4 months ago (1 children)

Do you put effort into your commit messages before the rewrite, or just write something quick for yourself and then put in the effort later?

[–] [email protected] 2 points 4 months ago

Depends, but usually I will put in the effort up front and maybe tweak them in an in[eractive rebase, or just manually copy+paste.

If they're worth saving. Sometimes you have to kill your darlings though

[–] [email protected] 10 points 4 months ago

git commit --amend --no-edit

This helped me countless times...

[–] [email protected] 6 points 4 months ago

Senior developer tip: Squash ~~the evidence~~ management

[–] [email protected] 9 points 4 months ago 
git reset head~9
git add -A
git commit -am 'Rebased lol'
git push -f