From: Sverre Rabbelier <srabbelier@gmail.com>
To: Yuval Kogman <nothingmuch@woobling.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Add --ff-only flag to git-merge
Date: Wed, 28 Jan 2009 15:35:48 +0100 [thread overview]
Message-ID: <bd6139dc0901280635q6b6d538axede045de121f72b6@mail.gmail.com> (raw)
In-Reply-To: <1233147238-30082-1-git-send-email-nothingmuch@woobling.org>
On Wed, Jan 28, 2009 at 13:53, Yuval Kogman <nothingmuch@woobling.org> wrote:
> This patch adds an --ff-only flag to git-merge. When specified git-merge
> will exit with an error whenver a merge will not be a simple fast
> forward, similar to the default behavior of git push.
I like! This calls for a new alias 'git config alias.integrate "merge
--no-ff"', thanks!
*hopes this hits next soon*
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2009-01-28 14:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-28 12:53 [PATCH] Add --ff-only flag to git-merge Yuval Kogman
2009-01-28 13:26 ` Johannes Schindelin
2009-01-28 13:29 ` Yuval Kogman
2009-01-28 14:35 ` Sverre Rabbelier [this message]
2009-01-28 21:12 ` Junio C Hamano
2009-01-29 20:57 ` Yuval Kogman
2009-01-29 22:29 ` Junio C Hamano
2009-01-30 4:32 ` [PATCH] Add --ff-only flag to git-merge (take 2) Yuval Kogman
2009-01-30 4:32 ` [PATCH] Add --ff-only flag to git-merge Yuval Kogman
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=bd6139dc0901280635q6b6d538axede045de121f72b6@mail.gmail.com \
--to=srabbelier@gmail.com \
--cc=git@vger.kernel.org \
--cc=nothingmuch@woobling.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).