git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 24, 2014, 04:23 UTC
Message-ID
<53801ea595071_e568c52f816@nysa.notmuch>
In-Reply-To
<xmqqha4lxyqt.fsf@gitster.dls.corp.google.com>
Junio C Hamano wrote:
Show 7 quoted lines
> 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
Previous: Felipe Contreras
Message 9 of 9 in “[ANNOUNCE] git reintegrate v0.3; manager of integration branches”
  1. Felipe ContrerasMay 19, 2014
  2. Junio C HamanoMay 19, 2014
  3. Felipe ContrerasMay 20, 2014
  4. Junio C HamanoMay 20, 2014
  5. Felipe ContrerasMay 20, 2014
  6. Junio C HamanoMay 20, 2014
  7. Felipe ContrerasMay 20, 2014
  8. Felipe ContrerasMay 24, 2014
  9. Felipe ContrerasMay 24, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.