[funkymike]

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.