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

Re: Branch shuffling after 1.6.6 release plans

From
ILIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Date
Dec 25, 2009, 12:28 UTC
Message-ID
<20091225122848.GA11550@Knoppix>
In-Reply-To
<200912251230.48243.trast@student.ethz.ch>
On Fri, Dec 25, 2009 at 12:30:34PM +0100, Thomas Rast wrote:
Show 6 quoted lines
> 
> I can try hacking some internal option into the merge helpers, by
> which they declare to be (in)compatible with rebasing.  I think this
> what Dscho or Sverre mentioned in the corresponding thread, but I
> forgot about it when I noticed you had already promoted the above to
> 'next'.

If you do that, maybe do all relevant flags (such as "no fast forwards" and "no trivial merging") at the same time. That would allow external strategies to use those flags.

-Ilari
Previous: Thomas RastNext: Jeff King
Message 6 of 7 in “[ANNOUNCE] Git 1.6.6”
  1. Junio C HamanoDec 24, 2009
  2. Some stats for 1.6.6Junio C Hamano, Dec 24, 2009
  3. Shawn O. PearceDec 24, 2009
  4. Branch shuffling after 1.6.6 release plansJunio C Hamano, Dec 25, 2009
  5. Thomas RastDec 25, 2009
  6. Ilari LiusvaaraDec 25, 2009
  7. Jeff KingDec 26, 2009

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.