From: Jay Soffian <jaysoffian@gmail.com>
Date: Tue, 15 Feb 2011 16:16:03 GMT
Subject: Re: configuring cherry-pick to always use -x?
Message-ID: <AANLkTinMBBKwtkQKgyqaN+oH4-k1Ks_6SbnU7thzuuYs@mail.gmail.com>
In-Reply-To: <4D5A401B.1050103@drmicha.warpmail.net>

On Tue, Feb 15, 2011 at 3:58 AM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> - If you do want them on the same branch "f-release", you probably know
> beforehand which commits you don't want on master. You can fake-merge
> these ("merge -Xours") to master and merge the others, which is somewhat
> ugly but still better than cherry-picking everything. In some sense this
> is "manual rerere" whose results are shared (pushed) easily.(*)

I personally prefer cherry-pick, as the fake merge clutters mainline's
history with the superseded commits.

It would be interesting to have a history simplification that given a
merge M of parents A and B, ignored commits $(merge-base A B)..B where
M is TREESAME to A. Hmm, that's effectively "git rev-list ." isn't it?

j.