From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.3 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 01B721F9FD for ; Tue, 9 Mar 2021 01:04:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229517AbhCIBEH (ORCPT ); Mon, 8 Mar 2021 20:04:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbhCIBDw (ORCPT ); Mon, 8 Mar 2021 20:03:52 -0500 Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCFF6C06174A for ; Mon, 8 Mar 2021 17:03:51 -0800 (PST) Received: from vapier (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2E4E340806; Tue, 9 Mar 2021 01:03:50 +0000 (UTC) Date: Mon, 8 Mar 2021 20:03:51 -0500 From: Mike Frysinger To: Junio C Hamano Cc: git@vger.kernel.org Subject: Re: [PATCH] contrib/rebase-catchup: helper for updating old branches Message-ID: Mail-Followup-To: Junio C Hamano , git@vger.kernel.org References: <20210308230345.28498-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 08 Mar 2021 15:38, Junio C Hamano wrote: > Mike Frysinger 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