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

Re: [RFC] git rebase -s ours

From
Jeff King <peff@peff.net>
Date
Mar 3, 2008, 05:41 UTC
Message-ID
<20080303054126.GB24210@coredump.intra.peff.net>
In-Reply-To
<20080302124848.GB8696@glandium.org>
On Sun, Mar 02, 2008 at 01:48:48PM +0100, Mike Hommey wrote:
> I don't have a workflow in mind, but I have expectations: considering
> the documentation, I would expect git rebase -s ours to do what git
> filter-branch can do with grafts.
I'm not sure I follow. Can you elaborate?
-Peff
Previous: Mike HommeyNext: Mike Hommey
Message 4 of 7 in “[RFC] git rebase -s ours”
  1. Mike HommeyMar 1, 2008
  2. Jeff KingMar 2, 2008
  3. Mike HommeyMar 2, 2008
  4. Jeff KingMar 3, 2008
  5. Mike HommeyMar 3, 2008
  6. Jeff KingMar 3, 2008
  7. Mike HommeyMar 3, 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.