From: Mike Frysinger <vapier@gentoo.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] contrib/rebase-catchup: helper for updating old branches
Date: Mon, 8 Mar 2021 20:03:51 -0500 [thread overview]
Message-ID: <YEbJd3Y/8ep1d5gc@vapier> (raw)
In-Reply-To: <xmqqk0qh43ob.fsf@gitster.c.googlers.com>
On 08 Mar 2021 15:38, Junio C Hamano wrote:
> Mike Frysinger <vapier@gentoo.org> writes:
> > For people who want to rebase their work onto the latest branch
> > (instead of merging), but there's many conflicting changes. This
> > allows you to address those conflicts one-by-one and work through
> > each issue instead of trying to take them all on at once.
>
> I wonder how well this compares or complements with Michael
> Haggerty's "git imerge".
thanks, hadn't heard of that before
> > If there's no interest in merging this into contrib, then this is more spam,
> > and anyone interested can use https://github.com/vapier/git-rebase-catchup
>
> The thinking during the past several years is that the Git ecosystem
> and userbase have grown large enough, and unlike our earlier years,
> individual add-on's like this (and "imerge" I mentioned earlier) can
> thrive without being in-tree to gain an undue exposure boost over
> its competitors, so I doubt that adding more stuff to contrib/ would
> be a good direction to go in the longer term.
i'm totally fine with "no". thanks for the info.
-mike
prev parent reply other threads:[~2021-03-09 1:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 23:03 [PATCH] contrib/rebase-catchup: helper for updating old branches Mike Frysinger
2021-03-08 23:38 ` Junio C Hamano
2021-03-09 1:03 ` Mike Frysinger [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=YEbJd3Y/8ep1d5gc@vapier \
--to=vapier@gentoo.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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.