617
I realised this today (lemmy.world)
submitted 6 months ago by miridius@lemmy.world to c/programmer_humor@programming.dev
26 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[-] Korne127@lemmy.world 5 points 6 months ago

Instant commit --amend + push --force

[-] omidmnz@programming.dev 6 points 6 months ago

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

[-] xmunk@sh.itjust.works 3 points 6 months ago

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

[-] rufus@lemmy.sdf.org 4 points 6 months ago

Wait what is the difference between the two?

[-] xmunk@sh.itjust.works 11 points 6 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.

this post was submitted on 27 Apr 2024
617 points (98.3% liked)

Programmer Humor

19623 readers
220 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
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev