From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jeff King <peff@peff.net>
Cc: Steve Keller <keller.steve@gmx.de>, git@vger.kernel.org
Subject: Re: Develop a patch series with git?
Date: Wed, 12 Feb 2020 10:02:09 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2002121000500.3718@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20200211200044.GG2127797@coredump.intra.peff.net>
Hi,
On Tue, 11 Feb 2020, Jeff King wrote:
> On Tue, Feb 11, 2020 at 10:22:20AM +0100, Steve Keller wrote:
>
> > I wonder how git supports developing a series of small patches. In my
> > usual development I go back and forth along a series of patches before
> > I can commit them all. I use quilt for that.
> >
> > Say I want to add feature FOO and start a patch "FOO" editing some
> > source file. In the process of doing so I realize that I need an
> > extension of some function to base my patch on, so I do "quilt pop" to
> > undo patch FOO and insert a new patch BAR and then re-apply FOO by
> > calling quilt push. No I can use the new extension from BAR in my
> > current patch FOO. The patch series often contains quite a number of
> > patches and I push, pop, and edit these patches quite often. Only
> > when everything is done I use git commit all the patches into the
> > repository.
> >
> > My question is whether there is git functionality to replace quilt.
> > Or is the combination of quilt and git common?
>
> Another responder mentioned "rebase -i", which is the most direct
> equivalent.
I think the most direct equivalent is `guilt`:
https://repo.or.cz/w/guilt.git
There haven't been any patches since May 2018 which either means that the
project is dead or that it is so robust that no changes are necessary
anymore.
Ciao,
Johannes
prev parent reply other threads:[~2020-02-12 9:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 9:22 Develop a patch series with git? Steve Keller
2020-02-11 13:40 ` Shourya Shukla
2020-02-11 20:00 ` Jeff King
2020-02-12 9:02 ` Johannes Schindelin [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
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=nycvar.QRO.7.76.6.2002121000500.3718@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=keller.steve@gmx.de \
--cc=peff@peff.net \
/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).