News for hackers. Stuff that matters.
Re:Git email flow vs. GitHub flow by masklinn on Tuesday March 30, 2021 @12:30PM (#26636708)
> A pull is just a fetch followed by a merge. So to solve this problem, just fetch instead of pull!

Of course, that’s what I do. But “git pull” is still a danger, and configuring merge.ff=only protects against that danger.

Re:Git email flow vs. GitHub flow by rectang on Tuesday March 30, 2021 @04:01PM (#26639653)
Why is `git pull` a "danger" if you always use `git fetch`? The configuration setting for merge.ff only affects the local machine. It doesn't generally impact other developers.

(Unless you're doing something like setting the system gitconfig on a shared dev box, and setting merge.ff to anything other than the default would be really heavy handed in such an envronment.)