From: Johannes Schindelin Date: Mon, 17 Aug 2015 10:09:58 GMT Subject: Re: [PATCH] am --abort: merge ORIG_HEAD tree into index Message-ID: <33846154f448fa217389d91583ff081e@www.dscho.org> In-Reply-To: <20150817094819.GA10375@yoshi.chippynet.com> Hi Paul, On 2015-08-17 11:48, Paul Tan wrote: > It's true that we need to merge the ORIG_HEAD tree into the index > instead of overwriting it. Patch below. Thanks for your impressive, very responsive work! Dscho