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

[RFC] git rebase -s ours

From
Mike Hommey <mh@glandium.org>
Date
Mar 1, 2008, 11:17 UTC
Message-ID
<20080301111716.GA3263@glandium.org>
Hi,

What do you think git rebase -s ours should be considering as "ours"? If I'm not mistaken, at the moment, "ours" stands for "upstream", which is kind of confusing...

Mike
Next: Jeff King
Message 1 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.