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

Re: Develop a patch series with git?

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 12, 2020, 09:02 UTC
Message-ID
<nycvar.QRO.7.76.6.2002121000500.3718@tvgsbejvaqbjf.bet>
In-Reply-To
<20200211200044.GG2127797@coredump.intra.peff.net>
Hi,
On Tue, 11 Feb 2020, Jeff King wrote:
Show 21 quoted lines
> 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

Previous: Jeff King
Message 4 of 4 in “Develop a patch series with git?”
  1. Steve KellerFeb 11, 2020
  2. Shourya ShuklaFeb 11, 2020
  3. Jeff KingFeb 11, 2020
  4. Johannes SchindelinFeb 12, 2020

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.