I have this in my .gitconfig so the pull will fail rather than merge. [pull] ff ...

		funkymike on June 21, 2021 \| parent \| context \| favorite \| on: Git undo: We can do better I have this in my .gitconfig so the pull will fail rather than merge. `[pull] ff = only` If it does fail I can decide whether to merge or rebase.