git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Victor Engmark <victor.engmark@gmail.com>
To: Git <git@vger.kernel.org>
Subject: `-u`/`update-head-ok` unsupported on pull
Date: Thu, 8 Oct 2015 18:27:44 +0100	[thread overview]
Message-ID: <CAA5Ydx9ySzEBWcUkmGQKTq93W0HzfEmb3ER7GPKzcnQJ0dbFKw@mail.gmail.com> (raw)

According to the documentation these options are supported:
$ git help pull | grep -e '--update-head-ok'
       -u, --update-head-ok

However:
$ 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

             reply	other threads:[~2015-10-08 17:28 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-08 17:27 Victor Engmark [this message]
2015-10-08 18:13 ` `-u`/`update-head-ok` unsupported on pull Stefan Beller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAA5Ydx9ySzEBWcUkmGQKTq93W0HzfEmb3ER7GPKzcnQJ0dbFKw@mail.gmail.com \
    --to=victor.engmark@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).