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

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
rebase --skip` took 1m40s without, and 5s with, this patch.

Reported-and-suggested-by: Kim Gybels [off-list ref]
Original report: https://github.com/git-for-windows/git/issues/365
Acked-by: Paul Tan <redacted>
Signed-off-by: Johannes Schindelin <redacted>
---
 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