From: "J. Bruce Fields" <bfields@fieldses.org>
To: Carl Worth <cworth@cworth.org>
Cc: Tom Clarke <tom@u2i.com>, Junio C Hamano <gitster@pobox.com>,
Johannes.Schindelin@gmx.de, git@vger.kernel.org
Subject: Re: [PATCH] Adding rebase merge strategy
Date: Mon, 1 Oct 2007 19:09:36 -0400 [thread overview]
Message-ID: <20071001230936.GA5556@fieldses.org> (raw)
In-Reply-To: <87ejgescnb.wl%cworth@cworth.org>
On Mon, Oct 01, 2007 at 03:17:28PM -0700, Carl Worth wrote:
> What I think I've always wanted is something like the following
> behavior for "git pull":
>
> * Fast forward if possible
>
> * Otherwise, rebase, but only if there are no conflicts at all
>
> * Otherwise, do the merge as normal, (leave conflict markers in
> place allowing the user to fix them up and then commit).
>
> Would it be straightforward to turn your rebase merge strategy into
> something like the above? And if so, would that address the primary
> concerns that Junio raised?
Surely the job of a merge strategy is to take two heads and produce a
single merge commit?
If it's worth automating the steps you describe above, I think it'd be
better to choose an entirely different name for the command.
--b.
next prev parent reply other threads:[~2007-10-01 23:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-28 16:15 [PATCH] Adding rebase merge strategy Tom Clarke
2007-09-28 17:03 ` Johannes Schindelin
2007-09-28 17:18 ` Tom Clarke
2007-10-01 15:08 ` Tom Clarke
2007-10-01 15:50 ` Johannes Schindelin
2007-10-01 21:01 ` Junio C Hamano
2007-10-01 21:41 ` Tom Clarke
2007-10-01 22:17 ` Carl Worth
2007-10-01 22:21 ` Tom Clarke
2007-10-01 22:30 ` Shawn O. Pearce
2007-10-01 22:53 ` Carl Worth
2007-10-01 23:11 ` Junio C Hamano
2007-10-02 10:00 ` Johannes Schindelin
2007-10-02 10:29 ` Tom Clarke
2007-10-02 18:40 ` Junio C Hamano
2007-10-03 14:11 ` Tom Clarke
2007-10-03 15:54 ` Johannes Schindelin
2007-10-01 23:09 ` J. Bruce Fields [this message]
2007-10-01 22:28 ` Junio C Hamano
[not found] <11885023904126-git-send-email-tom@u2i.com>
2007-08-30 19:36 ` Tom Clarke
2007-08-30 19:53 ` Johannes Schindelin
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=20071001230936.GA5556@fieldses.org \
--to=bfields@fieldses.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=cworth@cworth.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tom@u2i.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).