Programmer Humor

19817 readers

58 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

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

founded 2 years ago

MODERATORS

[email protected]

1113

Rebase Supremacy (programming.dev)

submitted 8 months ago by [email protected] to c/[email protected]

238 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] [email protected] 3 points 8 months ago* (last edited 8 months ago) (1 children)

At my company we just use a squash policy in gitlab. Every merge request becomes a single commit to the main branch. Super easy to read the commit log because all commits are descriptive instead of a bunch of “fix MR comments” or “fix pipeline errors”.

Another advice: git reset [commit-id] followed with a git commit -a is a quick way to squash all your commits.

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

Another advice ...quick way to squash all your commits

in your IDE select the commits you want to squash. Then rightclick. Then "squash". All done.

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

I am still mystified by IDE VCS tools. It’s usually faster for me to do a quick CLI shuffle than use the IDE.

[–] [email protected] 3 points 8 months ago

I use like 3 of the git-feature from intellij (out of 100 or so). But these 3 features save me a lot of time.

(the other 2 being the 3-way-merge-view and the commit-view where I can select changes for staging)