git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yuval Kogman <nothingmuch@woobling.org>
To: git@vger.kernel.org
Subject: [PATCH] Add --ff-only flag to git-merge (take 2)
Date: Fri, 30 Jan 2009 06:32:44 +0200	[thread overview]
Message-ID: <1233289965-19538-1-git-send-email-nothingmuch@woobling.org> (raw)
In-Reply-To: <7vbptpeoge.fsf@gitster.siamese.dyndns.org>

Hi,

This attempt fixes the various issues raised, except for the case of octopus
ending in 1 or more fast forwards. I'm not sure what the best way to fix this
is. I see three obvious options, none of which seem optimal:

	1. git-merge-octopus will take a --ff-only flag as well, adding a branch for that

	2. ff-only could be a merge strategy, and octopus is forbidden in
	   --ff-only, while this new strategy will behave just like octopus when
	   the merge can be fast forward only.

	3. the logic from git-merge-octopus could be duplicated into builtin-merge,
	   to handle only the fast forward case.

Please advise.

Regards,
Yuval

  reply	other threads:[~2009-01-30  4:34 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
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       ` Yuval Kogman [this message]
2009-01-30  4:32         ` 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=1233289965-19538-1-git-send-email-nothingmuch@woobling.org \
    --to=nothingmuch@woobling.org \
    --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).