2 ms·
> 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 dang
by masklinn 6y ago
> 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.
- rectang 6y agoWhy 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.)