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

Re: git pull on Linux/ACPI release tree

From
CMCatalin Marinas <catalin.marinas-5wv7dgnigg8@public.gmane.org>
Date
Jan 12, 2006, 16:10 UTC
Message-ID
<tnxirspo29g.fsf@arm.com>
In-Reply-To
<20060112013706.GA3339-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
Greg KH <greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org> wrote:
Show 8 quoted lines
> On Tue, Jan 10, 2006 at 09:19:09PM +0100, Adrian Bunk wrote:
>> 
>> I am using the workaround of carrying the patches in a mail folder, 
>> applying them in a batch, and not pulling from your tree between 
>> applying a batch of patches and you pulling from my tree.
>
> Ick, I'd strongly recommend using quilt for this.  It works great for
> just this kind of workflow.

Or StGIT :-). Similar workflow (and similar commands) but better integrated with GIT and better at dealing with conflicts since it uses a three-way merge when pushing patches rather than applying them with "patch".

-- 
Catalin
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous: Linus Torvalds
Message 21 of 21 in “RE: git pull on Linux/ACPI release tree”
  1. Brown, LenJan 8, 2006
  2. Linus TorvaldsJan 8, 2006
  3. Martin LanghoffJan 8, 2006
  4. Linus TorvaldsJan 8, 2006
  5. David S. MillerJan 8, 2006
  6. Luben TuikovJan 8, 2006
  7. Linus TorvaldsJan 9, 2006
  8. Junio C HamanoJan 8, 2006
  9. Linus TorvaldsJan 8, 2006
  10. Tony LuckJan 8, 2006
  11. Adrian BunkJan 8, 2006
  12. Willy TarreauJan 8, 2006
  13. Linus TorvaldsJan 9, 2006
  14. Adrian BunkJan 10, 2006
  15. Martin LanghoffJan 10, 2006
  16. Andreas EricssonJan 11, 2006
  17. Greg KHJan 12, 2006
  18. Adrian BunkJan 13, 2006
  19. Martin LanghoffJan 9, 2006
  20. Linus TorvaldsJan 10, 2006
  21. Catalin MarinasJan 12, 2006

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.