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
Stephen Haberman <stephen@exigencecorp.com>
Date
Sep 23, 2008, 21:22 UTC
Message-ID
<20080923162211.d4b15373.stephen@exigencecorp.com>
In-Reply-To
<48D95836.6040200@op5.se>
> Stephen, I had to modify the tests a bit to get them to work with how
> I implemented the merge-preserving rebase, and also to remove a lot of
> the cruft that was previously in there. Hope you're ok with the
> attribution in the commit message.
No problem, it looks great.

This is awesome. Thanks for the insanely short turnaround. The GIT_EDITOR=: hack is neat. I did not think it would be that simple.

- Stephen
Previous: Andreas EricssonNext: Andreas Ericsson
Message 2 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.