From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
Date: Wed, 09 Sep 2015 13:45:00 +0200 [thread overview]
Message-ID: <1da3956b12c7d20fcd90ebffea9c8f68@dscho.org> (raw)
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:
> 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
next prev parent reply other threads:[~2015-09-09 11:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-09 9:10 [PATCH] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index Johannes Schindelin
2015-09-09 11:45 ` Johannes Schindelin [this message]
2015-09-09 21:29 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1da3956b12c7d20fcd90ebffea9c8f68@dscho.org \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).