From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 24 May 2014 04:23:01 GMT
Subject: Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches
Message-ID: <53801ea595071_e568c52f816@nysa.notmuch>
In-Reply-To: <xmqqha4lxyqt.fsf@gitster.dls.corp.google.com>

Junio C Hamano wrote:
> I presume that the workflow can be mimicked by having another branch
> 'match-next' and building it on top of 'master', and then building
> 'jch' on top of it, and then building 'pu' on top of it.  Then you
> should be able to play 'match-next' instruction on top of 'next'
> (provided that there is a way to tell it to replay on HEAD and
> ignore "base" and have "merge" instruction become a no-op when the
> branch has already been merged).

Done.

% git checkout next
% git reintegrate --apply match-next

https://github.com/felipec/git-reintegrate/commit/036395b

-- 
Felipe Contreras