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

Re: [PATCH 1/3] Prepare for non-interactive merge-preserving rebase

From
Shawn O. Pearce <spearce@spearce.org>
Date
Sep 29, 2008, 16:11 UTC
Message-ID
<20080929161106.GL17584@spearce.org>
In-Reply-To
<48E0FC86.3040001@op5.se>
Andreas Ericsson <ae@op5.se> wrote:
Show 11 quoted lines
> Shawn O. Pearce wrote:
>> Andreas Ericsson <ae@op5.se> wrote:
>>> Shawn, I haven't seen this in any of your branches. Overlooked or
>>> dropped? 
>>
>> Thanks for the reminder.  It just got lost in the shuffle.
>
> Hold off on that if you haven't already applied them. I just noticed
> something strange in passing 15 minutes ago that I need to investigate
> a bit more. I need to get home now though, so I won't have time to
> test it further until later tonight.

Its only in a topic branch right now. I'll schedule them into 'pu' today just so they are available, but I'll be happy to replace any (or all) of the patches when you come up with something better.

-- 
Shawn.
Previous: Andreas EricssonNext: Stephen Haberman
Message 12 of 13 in “Prepare for non-interactive merge-preserving rebase”
  1. 1/3 Prepare for non-interactive merge-preserving rebaseAndreas Ericsson, Sep 23, 2008
  2. Stephen HabermanSep 23, 2008
  3. Andreas EricssonSep 23, 2008
  4. SZEDER GáborSep 24, 2008
  5. Johannes SixtSep 24, 2008
  6. Andreas EricssonSep 24, 2008
  7. Stephen HabermanOct 15, 2008
  8. Andreas EricssonSep 27, 2008
  9. Stephen HabermanSep 27, 2008
  10. Shawn O. PearceSep 29, 2008
  11. Andreas EricssonSep 29, 2008
  12. Shawn O. PearceSep 29, 2008
  13. Add branch.autosetuppreservemerges and branch.<name>.preservemerges.Stephen Haberman, Oct 1, 2008

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.