this post was submitted on 04 Apr 2024
1117 points (98.1% liked)

Programmer Humor

22295 readers
1216 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
1117
Rebase Supremacy (programming.dev)
submitted 1 year ago by JPDev@programming.dev to c/programmer_humor@programming.dev
238 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[โ€“] lightrush@lemmy.ca 10 points 1 year ago (1 children)

git merge --no-ff

[โ€“] SrTobi@feddit.de 4 points 1 year ago

git config --global merge.ff no