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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sep 9, 2015, 11:45 UTC
Message-ID: <1da3956b12c7d20fcd90ebffea9c8f68@dscho.org>
In-Reply-To: <0000014fb15e897e-4f1178b9-69d9-4015-808b-e073c134281c-000000@eu-west-1.amazonses.com>

Hi Junio,

On 2015-09-09 11:10, Johannes Schindelin wrote:

Show 13 quoted lines

> 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-suggested-by: Kim Gybels <kim.gybels@engilico.com>
> Original report: https://github.com/git-for-windows/git/issues/365
> Acked-by: Paul Tan <pyokagan@gmail.com>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>  contrib/examples/git-am.sh | 2 +-

Of course this should be `git-am.sh` in the 2.5.x branch... Could you adjust that on your side?

Thanks, Dscho