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

Re: Maintaining two branches.

From
Stephan Beyer <s-beyer@gmx.net>
Date
Jun 3, 2008, 18:02 UTC
Message-ID
<20080603180213.GA5541@leksak.fem-net>
In-Reply-To
<20080603163431.GA1244@old.davidb.org>
Hi,
> I've tried creating a 'next' branch where I merge each change from local
> and/or external, and this seems to work, but the history gets very
> cluttered with merge commits.

You could cherry-pick commits from local and/or external instead of merging. See git-cherry-pick(1).

Regards,
  Stephan
-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F
Previous: David BrownNext: David Brown
Message 2 of 7 in “Maintaining two branches.”
  1. David BrownJun 3, 2008
  2. Stephan BeyerJun 3, 2008
  3. David BrownJun 3, 2008
  4. Pieter de BieJun 3, 2008
  5. David BrownJun 3, 2008
  6. Dirk SüsserottJun 3, 2008
  7. Junio C HamanoJun 3, 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.