Protect our Git repos: stop foxtrot merges now (blog.bitbucket.org)

A better solution: rebase or cherry-pick so that every commit has one parent and history is linear. That way every commit shows what was actually changed.