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

Re: [PATCH] provide a new "theirs" strategy, useful for rebase --onto

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Jun 6, 2008, 14:14 UTC
Message-ID
<20080606141458.GQ29404@genesis.frugalware.org>
In-Reply-To
<E1K4a1Q-0002hq-QE@fencepost.gnu.org>
On Fri, Jun 06, 2008 at 12:59:30PM +0200, Paolo Bonzini <bonzini@gnu.org> wrote:
> The new strategy resolves only two heads, and the result of the merge
> is always the second head.  It can be useful with `rebase --onto`,
> because it always resolves conflicts in favor of the commits
> being applied.
Just wanted to say I like the idea. :-)
Previous: Paolo BonziniNext: Junio C Hamano
Message 4 of 10 in “provide a new "theirs" strategy, useful for rebase --onto”
  1. provide a new "theirs" strategy, useful for rebase --ontoPaolo Bonzini, Jun 6, 2008
  2. Peter KarlssonJun 6, 2008
  3. Paolo BonziniJun 6, 2008
  4. Miklos VajnaJun 6, 2008
  5. Junio C HamanoJun 6, 2008
  6. Paolo BonziniJun 8, 2008
  7. Junio C HamanoJun 8, 2008
  8. Paolo BonziniJun 8, 2008
  9. Junio C HamanoJun 8, 2008
  10. Paolo BonziniJun 8, 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.