From: Matt McClure <matthewlmcclure@gmail.com>
To: git@vger.kernel.org
Subject: override merge.ff = false using --ff-only
Date: Wed, 22 May 2013 09:21:23 -0400 [thread overview]
Message-ID: <CAJELnLFqzVBd57vudsCFrTNMVxETO75GT5T5NO0sDMtgHZJU6g@mail.gmail.com> (raw)
In-Reply-To: <CAJELnLEGCshD9z9get62+T6Z83OdPJ+A5BNSzsHA1_OC1Q00Hw@mail.gmail.com>
I naively tried to override merge.ff = false using --ff-only on the
command line. I expected that it would override the configured default
and perform a fast-forward merge. Instead, it said:
$ git config -l | grep -F 'merge.ff'
merge.ff=false
$ git merge --ff-only foo
fatal: You cannot combine --no-ff with --ff-only.
On the other hand, I see that --ff works just fine in the same initial state.
$ git merge --ff foo
Updating b869407..17b5495
Fast-forward
...
4 files changed, 2 insertions(+), 5 deletions(-)
Would it be better if --ff-only refused to merge only if the commits
themselves prevented fast-forwarding?
--
Matt McClure
http://matthewlmcclure.com
http://www.mapmyfitness.com/profile/matthewlmcclure
next parent reply other threads:[~2013-05-22 13:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAJELnLEGCshD9z9get62+T6Z83OdPJ+A5BNSzsHA1_OC1Q00Hw@mail.gmail.com>
2013-05-22 13:21 ` Matt McClure [this message]
2013-05-22 13:36 ` override merge.ff = false using --ff-only Yann Droneaud
2013-05-22 18:12 ` Junio C Hamano
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=CAJELnLFqzVBd57vudsCFrTNMVxETO75GT5T5NO0sDMtgHZJU6g@mail.gmail.com \
--to=matthewlmcclure@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).