Programmer Humor

19147 readers

1232 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 1 year ago

MODERATORS

[email protected]

613

I realised this today (lemmy.world)

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

26 comments fedilink hide all child comments

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

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

Instant commit --amend + push --force

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

Prefer --force-with-lease. It doesn't make a difference in this scenario, but it's a safer habit/default.

[–] xmunk 3 points 4 months ago (2 children)

There is no reason to force push anymore - force with lease is always preferable. So said, a frequent rebaser.

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

Wait what is the difference between the two?

[–] xmunk 11 points 4 months ago

Force with lease will send up what your local thinks the most recent commit on the branch was and the host will reject the push if it knows of a more recent commit on that branch. Basically, it saves you from overwriting a commit you didn't realize existed.