From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches
Date: Fri, 23 May 2014 23:23:01 -0500 [thread overview]
Message-ID: <53801ea595071_e568c52f816@nysa.notmuch> (raw)
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
prev parent reply other threads:[~2014-05-24 4:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-19 0:33 [ANNOUNCE] git reintegrate v0.3; manager of integration branches Felipe Contreras
2014-05-19 21:08 ` Junio C Hamano
2014-05-20 21:06 ` Felipe Contreras
2014-05-20 21:29 ` Junio C Hamano
2014-05-20 21:41 ` Felipe Contreras
2014-05-20 22:47 ` Junio C Hamano
2014-05-20 22:54 ` Felipe Contreras
2014-05-24 4:24 ` Felipe Contreras
2014-05-24 4:23 ` Felipe Contreras [this message]
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=53801ea595071_e568c52f816@nysa.notmuch \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).