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

2015-09-09 Thread Johannes Schindelin
Hi Junio, On 2015-09-09 11:10, Johannes Schindelin wrote: > This is a backport of the corresponding patch to the builtin am in 2.6: > 3ecc704 (am --skip/--abort: merge HEAD/ORIG_HEAD tree into index, > 2015-08-19). > > Reportedly, it can make a huge difference on Windows, in one case a `git >

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

2015-09-09 Thread Junio C Hamano
Johannes Schindelin writes: > On 2015-09-09 11:10, Johannes Schindelin wrote: >> This is a backport of the corresponding patch to the builtin am in 2.6: >> 3ecc704 (am --skip/--abort: merge HEAD/ORIG_HEAD tree into index, >> 2015-08-19). >> >> Reportedly, it can make