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

Re: Help breaking up a large merge.

From
David Brown <git@davidb.org>
Date
Sep 18, 2008, 17:47 UTC
Message-ID
<20080918174705.GA8055@linode.davidb.org>
In-Reply-To
<32541b130809181040p4785f877s7502c578e46745d8@mail.gmail.com>
On Thu, Sep 18, 2008 at 01:40:55PM -0400, Avery Pennarun wrote:
Show 6 quoted lines
>1) Generate a giant patch file using 'git diff X..A'.  Call the patch P.
>
>2) Using an editor, divide up the patch by files/subdirs based on how
>you want to subdivide the work.  Or alternatively, do that with 'git
>diff' itself, but beware of accidentally forgetting to ask for some
>files if you do it that way.  Call these n individual patches P1..Pn.

The is fairly close to the approach I've been taking, but somehow I didn't think of using the output of diff itself and hacking that up. I like this because it makes it easier to not forget some files.

It is likely there will be makefiles to cleanup and such, but otherwise I like this idea.

Thanks, David

Previous: Avery Pennarun
Message 6 of 6 in “Help breaking up a large merge.”
  1. David BrownSep 18, 2008
  2. Santi BéjarSep 18, 2008
  3. David BrownSep 18, 2008
  4. Johannes SixtSep 18, 2008
  5. Avery PennarunSep 18, 2008
  6. David BrownSep 18, 2008

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.