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

2015-09-09 Thread Junio C Hamano
nks. -- >8 -- From: Johannes Schindelin Date: Wed, 9 Sep 2015 09:10:07 + Subject: [PATCH] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index f8da6801 (am --skip: support skipping while on unborn branch, 2015-06-06) introduced a performance regression to "git am --skip", w

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 > reb

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

2015-09-09 Thread Johannes Schindelin
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 rebase --skip` took 1m40s without, and 5s with, this patch. Reported-and-