From: Stephan Beyer <s-beyer@gmx.net>
Date: Tue, 03 Jun 2008 18:02:13 GMT
Subject: Re: Maintaining two branches.
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