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

Re: [PATCH] am --abort: merge ORIG_HEAD tree into index

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Aug 17, 2015, 14:54 UTC
Message-ID
<CA+55aFzvw4ogQCUpEQXtOrpbvehXiVHTfQsPDk0-ZhEaEchm2Q@mail.gmail.com>
In-Reply-To
<20150817094819.GA10375@yoshi.chippynet.com>
On Mon, Aug 17, 2015 at 2:48 AM, Paul Tan <pyokagan@gmail.com> wrote:
>
> It's true that we need to merge the ORIG_HEAD tree into the index
> instead of overwriting it. Patch below.
Seems to work for me. Thanks,
                     Linus
Previous: Johannes SchindelinNext: Junio C Hamano
Message 6 of 9 in “"git am --abort" screwing up index?”
  1. Linus TorvaldsAug 16, 2015
  2. Linus TorvaldsAug 16, 2015
  3. Johannes SchindelinAug 17, 2015
  4. am --abort: merge ORIG_HEAD tree into indexPaul Tan, Aug 17, 2015
  5. Johannes SchindelinAug 17, 2015
  6. Linus TorvaldsAug 17, 2015
  7. Junio C HamanoAug 17, 2015
  8. am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan, Aug 19, 2015
  9. Junio C HamanoAug 19, 2015

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.