Set Git's pull.ff = only to avoid accidental merges on pull