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
Junio C Hamano <gitster@pobox.com>
Date
Jun 8, 2008, 20:59 UTC
Message-ID
<7vk5gziqxn.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<484BE0BE.1050102@gnu.org>
Paolo Bonzini <bonzini@gnu.org> writes:
Show 6 quoted lines
>    #! /bin/sh
>    # git-merge-after-amend <branch>
>    #
>    # Makes it possible to do a fast-forward merge of <branch>
>    # into HEAD, assuming that the first diverging commit of <branch>
>    # is an --amend'ed version of the first diverging commit of HEAD.

Can this strong special case limitation "only the first one can be the amend" somehow be loosened? Otherwise I suspect it would not be useful as a general solution.

Previous: Paolo BonziniNext: Paolo Bonzini
Message 9 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.