From: Michael J Gruber <git@drmicha.warpmail.net>
To: Florian Weimer <fweimer@bfk.de>
Cc: git@vger.kernel.org
Subject: Re: Fast-forward-only merge
Date: Fri, 24 Jul 2009 12:40:00 +0200 [thread overview]
Message-ID: <4A698F80.2020801@drmicha.warpmail.net> (raw)
In-Reply-To: <82ws5y4dfs.fsf@mid.bfk.de>
Florian Weimer venit, vidit, dixit 24.07.2009 11:50:
> Is there an easy way to require that "git merge" succeeds only if the
> merge is fast-forward?
>
There's an easy way to test before the merge (git merge-base), but an
option for git merge is still missing:
http://article.gmane.org/gmane.comp.version-control.git/76787
http://article.gmane.org/gmane.comp.version-control.git/80284
http://article.gmane.org/gmane.comp.version-control.git/107768
http://article.gmane.org/gmane.comp.version-control.git/118529
Cheers,
Michael
prev parent reply other threads:[~2009-07-24 10:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-24 9:50 Fast-forward-only merge Florian Weimer
2009-07-24 10:40 ` Michael J Gruber [this message]
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=4A698F80.2020801@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=fweimer@bfk.de \
--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).