{"thread":{"id":"40520","subject":"`-u`/`update-head-ok` unsupported on pull","startedAt":"2015-10-08T17:27:44Z","lastAt":"2015-10-08T18:13:34Z","messageCount":2,"participants":["Victor Engmark","Stefan Beller"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"271327","messageId":"CAA5Ydx9ySzEBWcUkmGQKTq93W0HzfEmb3ER7GPKzcnQJ0dbFKw@mail.gmail.com","threadId":"40520","inReplyTo":null,"subject":"`-u`/`update-head-ok` unsupported on pull","fromName":"Victor Engmark","fromEmail":"victor.engmark@gmail.com","sentAt":"2015-10-08T17:27:44Z","receivedAt":"2015-10-08T17:27:44Z","isPatch":false,"sender":{"key":"victor.engmark@gmail.com","avatar":"https://gravatar.com/avatar/5d7b4229a48f2ed011a265c19a1881c4ee58946449215db6627373a244c8aa4c?d=mp&s=160"},"body":"According to the documentation these options are supported:\n$ git help pull | grep -e '--update-head-ok'\n       -u, --update-head-ok\n\nHowever:\n$ git pull --update-head-ok\nerror: unknown option `update-head-ok'\n\nUsing:\n$ git --version\ngit version 2.6.1\n$ pacman --query --info git | grep ^Version\nVersion        : 2.6.1-1\n\nAm I missing something? The manual seems to be for the right version:\n\n$ git help pull | tail -n1 | tr -s ' '\nGit 2.6.1 10/06/2015 GIT-PULL(1)\n\nI'm running the system installed Git:\n\n$ type -a git\ngit is /usr/bin/git\n\nCheers\nVictor\n"},{"id":"271329","messageId":"CAGZ79kavoUw5tkeABkYXEsa7jt-2aRxjGyOB+=ofnuqpQBGGkA@mail.gmail.com","threadId":"40520","inReplyTo":"CAA5Ydx9ySzEBWcUkmGQKTq93W0HzfEmb3ER7GPKzcnQJ0dbFKw@mail.gmail.com","subject":"Re: `-u`/`update-head-ok` unsupported on pull","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2015-10-08T18:13:34Z","receivedAt":"2015-10-08T18:13:34Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"+Paul Tan who rewrote git pull in C recently.\n\nThe manpage:\n-u, --update-head-ok\n           By default git fetch refuses to update the head which\ncorresponds to the current branch. This flag disables the check. This\nis purely for the internal use for git pull to communicate with\n           git fetch, and unless you are implementing your own\nPorcelain you are not supposed to use it.\n\nI guess we either need to update the manpage to remove that option\nthen, or add it back in in case somebody actually uses it despite the\nwarning in the man page?\n"}]}