From: Junio C Hamano <gitster@pobox.com>
To: Mike Frysinger <vapier@gentoo.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] contrib/rebase-catchup: helper for updating old branches
Date: Mon, 08 Mar 2021 15:38:12 -0800 [thread overview]
Message-ID: <xmqqk0qh43ob.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20210308230345.28498-1-vapier@gentoo.org> (Mike Frysinger's message of "Mon, 8 Mar 2021 18:03:45 -0500")
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".
> 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.
> create mode 100755 contrib/rebase-catchup/git-rebase-catchup.py
And it does not help for this to be written in Python (which we've
been moving away from).
Having said all that, the end-user community may benefit from having
a well curated set of third-party tools advertised at a single
autoritative-sounding place, but it is dubious that contrib/
subdirectory of my tree should be such a place (I won't be its
curator anyway).
Perhaps there is an opening for non-code contribution for those
without much programming experience but with great organizational
skills.
Thanks.
next prev parent reply other threads:[~2021-03-08 23:38 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 [this message]
2021-03-09 1:03 ` Mike Frysinger
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk0qh43ob.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=vapier@gentoo.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).