From: Catalin Marinas <catalin.marinas@gmail.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Chris Mason <mason@suse.com>, Petr Baudis <pasky@suse.cz>,
Theodore Ts'o <tytso@mit.edu>,
Joel Becker <Joel.Becker@oracle.com>,
Junio C Hamano <junkio@cox.net>,
git@vger.kernel.org
Subject: Re: hgmq vs. StGIT
Date: Tue, 1 Nov 2005 17:13:26 +0000 [thread overview]
Message-ID: <b0943d9e0511010913p2914ae85k@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0511010757040.27915@g5.osdl.org>
On 01/11/05, Linus Torvalds <torvalds@osdl.org> wrote:
> On Tue, 1 Nov 2005, Chris Mason wrote:
> > StGIT has the ability to rebase patches via three-way merge. This is
> > still on my todo list for mq.
>
> So I'm _neither_ a StGIT not mq user, but I can definitely say that
> rebasing with a three-way merge instead of just trying to apply the patch
> (whether in reverse like in a merge, or just re-apply it straigt) is
> really really nice.
StGIT first tries a "git-diff-tree | git-apply" since it is faster but
when this fails it falls back to a three-way merge. A 'stg status'
command would show the conflicted files and they should be marked as
resolved before refreshing the patch.
One of the good parts of the three-way merge is that it detects when a
patch you sent was fully merged upstream, the local patch becoming
empty after the merge. If not, you either get a conflict or the merge
leaves the patch with only the unmerged parts.
--
Catalin
next prev parent reply other threads:[~2005-11-01 17:13 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-31 1:50 git versus CVS (versus bk) walt
2005-10-31 1:59 ` Martin Langhoff
2005-10-31 2:03 ` H. Peter Anvin
2005-10-31 2:35 ` Linus Torvalds
2005-10-31 10:24 ` Johannes Schindelin
2005-10-31 16:18 ` Linus Torvalds
2005-10-31 18:18 ` wa1ter
2005-10-31 19:44 ` Randal L. Schwartz
2005-10-31 23:41 ` walt
2005-11-01 0:15 ` Daniel Barkalow
2005-11-01 0:21 ` Linus Torvalds
2005-10-31 19:50 ` Joel Becker
2005-10-31 20:28 ` Martin Langhoff
2005-10-31 21:30 ` Joel Becker
2005-11-01 9:15 ` Petr Baudis
2005-11-01 16:17 ` Joel Becker
2005-11-01 17:35 ` Petr Baudis
2005-11-07 22:56 ` Petr Baudis
2005-11-08 10:50 ` Josef Weidendorfer
2005-11-08 12:04 ` Petr Baudis
2005-11-01 2:17 ` Randal L. Schwartz
2005-11-01 2:23 ` Linus Torvalds
2005-11-01 2:34 ` Randal L. Schwartz
2005-11-01 2:47 ` Linus Torvalds
2005-11-01 2:35 ` Junio C Hamano
2005-11-01 23:56 ` Horst von Brand
2005-11-02 8:54 ` Andreas Ericsson
2005-11-02 9:26 ` Junio C Hamano
2005-10-31 21:00 ` Junio C Hamano
2005-10-31 21:36 ` Joel Becker
2005-10-31 21:53 ` Linus Torvalds
2005-10-31 22:14 ` Junio C Hamano
2005-10-31 22:42 ` Joel Becker
2005-11-01 0:20 ` Junio C Hamano
2005-11-01 0:42 ` Joel Becker
2005-11-01 1:02 ` Martin Langhoff
2005-11-01 1:29 ` Joel Becker
2005-11-01 1:48 ` Linus Torvalds
2005-11-01 9:17 ` Petr Baudis
2005-11-01 13:25 ` Catalin Marinas
2005-11-01 0:25 ` Theodore Ts'o
2005-11-01 9:08 ` hgmq vs. StGIT Petr Baudis
2005-11-01 9:23 ` Catalin Marinas
2005-11-01 10:10 ` Petr Baudis
2005-11-01 17:34 ` Catalin Marinas
2005-11-01 15:20 ` Chuck Lever
2005-11-01 15:36 ` Chris Mason
2005-11-01 17:18 ` Catalin Marinas
2005-11-01 18:13 ` Chris Mason
2005-11-01 21:30 ` Catalin Marinas
2005-11-02 15:41 ` Chris Mason
2005-11-05 20:23 ` Catalin Marinas
2005-11-09 23:32 ` Petr Baudis
2005-11-10 0:08 ` Pavel Machek
2005-11-10 16:20 ` Catalin Marinas
2005-11-01 14:11 ` Chris Mason
2005-11-01 16:00 ` Linus Torvalds
2005-11-01 17:13 ` Catalin Marinas [this message]
2005-11-01 17:29 ` Catalin Marinas
2005-11-01 17:59 ` Chris Mason
2005-11-01 21:22 ` Catalin Marinas
2005-11-01 0:31 ` git versus CVS (versus bk) Daniel Barkalow
2005-10-31 21:35 ` Linus Torvalds
2005-10-31 13:00 ` wa1ter
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=b0943d9e0511010913p2914ae85k@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=Joel.Becker@oracle.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=mason@suse.com \
--cc=pasky@suse.cz \
--cc=torvalds@osdl.org \
--cc=tytso@mit.edu \
/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.