git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] contrib/rebase-catchup: helper for updating old branches

From
Mike Frysinger <vapier@gentoo.org>
Date
Mar 9, 2021, 01:03 UTC
Message-ID
<YEbJd3Y/8ep1d5gc@vapier>
In-Reply-To
<xmqqk0qh43ob.fsf@gitster.c.googlers.com>
On 08 Mar 2021 15:38, Junio C Hamano wrote:
Show 8 quoted lines
> 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
Show 9 quoted lines
> > 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

Previous: Junio C Hamano
Message 3 of 3 in “contrib/rebase-catchup: helper for updating old branches”
  1. contrib/rebase-catchup: helper for updating old branchesMike Frysinger, Mar 8, 2021
  2. Junio C HamanoMar 8, 2021
  3. Mike FrysingerMar 9, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.