All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: RFC: Patch editing
Date: Mon, 26 Feb 2007 11:51:01 -0800	[thread overview]
Message-ID: <7vveholmu2.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20070226185655.GB2108@spearce.org> (Shawn O. Pearce's message of "Mon, 26 Feb 2007 13:56:55 -0500")

"Shawn O. Pearce" <spearce@spearce.org> writes:

> Yea - this is a lot like rebase.  I was also thinking that the -m
> (merge mode) in rebase probably should be the only option offered.
> I don't see why rebase should format-patch|am when we have the
> whole commit available and merge-recursive does an excellent job
> on tree level merges.

One reason is that it just matches the practice to the mental
model.  Rebasing is like sending yourself a patch series and
applying with 'am' on top of a known commit afresh, which is
exactly what the command without -m does.

The other historical reason is that reconstructing (with -3) the
only part of the tree that matters in the 3-way merge and
running the merge was a lot faster with the merge tool we had,
than a full 3-way merge.

  reply	other threads:[~2007-02-26 19:51 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-25 21:59 RFC: Patch editing Johannes Schindelin
2007-02-26 13:18 ` Peter Baumann
2007-02-26 18:03 ` Shawn O. Pearce
2007-02-26 18:52   ` Johannes Schindelin
2007-02-26 18:56     ` Shawn O. Pearce
2007-02-26 19:51       ` Junio C Hamano [this message]
2007-02-27  7:14 ` Daniel Barkalow
2007-02-27 11:54   ` Johannes Schindelin
2007-02-27 17:35     ` Daniel Barkalow
2007-02-27 20:07       ` Johannes Schindelin
2007-02-27 22:07         ` Daniel Barkalow
2007-02-27 22:37           ` Johannes Schindelin
2007-02-28 10:13           ` Karl Hasselström
2007-03-01 23:30 ` Updated version, was " Johannes Schindelin
2007-03-01 23:59   ` 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=7vveholmu2.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=spearce@spearce.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.