From: "Lars Hjemli" <hjemli@gmail.com>
To: "Yin Ping" <pkufranky@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [BUG?] git-pull and git-merge don't support option --ff as the document says
Date: Mon, 29 Oct 2007 08:14:54 +0100 [thread overview]
Message-ID: <8c5c35580710290014o5750214te5b20eaf6127de9c@mail.gmail.com> (raw)
In-Reply-To: <46dff0320710280936g4b1022fcpab02e72b99afa0f@mail.gmail.com>
On 10/28/07, Yin Ping <pkufranky@gmail.com> wrote:
> Released git version 1.5.3.4
--ff/--no-ff is not part of any released git version; you'll need to
build the 'master' branch of git.git. And they're currently only
supported by git-merge, not git-pull (the same goes for --no-squash).
--
larsh
next prev parent reply other threads:[~2007-10-29 7:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-28 16:36 [BUG?] git-pull and git-merge don't support option --ff as the document says Yin Ping
2007-10-29 7:14 ` Lars Hjemli [this message]
2007-10-29 13:05 ` Yin Ping
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=8c5c35580710290014o5750214te5b20eaf6127de9c@mail.gmail.com \
--to=hjemli@gmail.com \
--cc=git@vger.kernel.org \
--cc=pkufranky@gmail.com \
/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).