From: David Brown <git@davidb.org>
To: Stephan Beyer <s-beyer@gmx.net>
Cc: git@vger.kernel.org
Subject: Re: Maintaining two branches.
Date: Tue, 3 Jun 2008 11:13:24 -0700 [thread overview]
Message-ID: <20080603181324.GA11735@old.davidb.org> (raw)
In-Reply-To: <20080603180213.GA5541@leksak.fem-net>
On Tue, Jun 03, 2008 at 08:02:13PM +0200, Stephan Beyer wrote:
>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).
The problem is that this makes future merges more difficult, since there
isn't a history between the trees. Our 'local' branch really is a merge of
the two.
Once I cherry pick anything, that branch has divergent history from the
other branches, and I have to cherry pick from then on (or merge from then
on).
David
next prev parent reply other threads:[~2008-06-03 18:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-03 16:34 Maintaining two branches David Brown
2008-06-03 18:02 ` Stephan Beyer
2008-06-03 18:13 ` David Brown [this message]
2008-06-03 18:08 ` Pieter de Bie
2008-06-03 18:17 ` David Brown
2008-06-03 18:41 ` Dirk Süsserott
2008-06-03 19:09 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080603181324.GA11735@old.davidb.org \
--to=git@davidb.org \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).