According to the documentation these options are supported:
$ git help pull | grep -e '--update-head-ok'
-u, --update-head-okHowever: $ git pull --update-head-ok error: unknown option `update-head-ok'
Using: $ git --version git version 2.6.1 $ pacman --query --info git | grep ^Version Version : 2.6.1-1
Am I missing something? The manual seems to be for the right version:
$ git help pull | tail -n1 | tr -s ' ' Git 2.6.1 10/06/2015 GIT-PULL(1)
I'm running the system installed Git:
$ type -a git git is /usr/bin/git
Cheers Victor