From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Aug 2015 14:54:46 GMT
Subject: Re: [PATCH] am --abort: merge ORIG_HEAD tree into index
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