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

Re: [ANNOUNCE] git reintegrate 0.1; manager of integration branches

From
John Keeping <john@keeping.me.uk>
Date
Nov 2, 2013, 11:00 UTC
Message-ID
<20131102110028.GD24023@serenity.lan>
In-Reply-To
<CAMP44s2cuHnW0cGEBRt2EmG8Wmav4athMLXRCh2cJ2KymeHmmg@mail.gmail.com>
On Fri, Nov 01, 2013 at 06:35:39AM -0600, Felipe Contreras wrote:
> One feature that is missing from git-integration is the ability to
> parse existing integration branches.
Nice - I'd never thought of doing this.
> It also has support for "evil merges", so it should be perfectly
> usable for git.git maintenance.

By this, do you mean that you have an ability to squash a fixup into the merge? If so, how do you handle this in the status display - I've had a WIP branch for a while but haven't come up with a satisfactory way of displaying the status of a fixup.

Previous: Felipe ContrerasNext: Felipe Contreras
Message 2 of 3 in “[ANNOUNCE] git reintegrate 0.1; manager of integration branches”
  1. Felipe ContrerasNov 1, 2013
  2. John KeepingNov 2, 2013
  3. Felipe ContrerasNov 2, 2013

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.