[PATCH] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Sep 9, 2015, 09:10 UTC
- Message-ID
- <0000014fb15e897e-4f1178b9-69d9-4015-808b-e073c134281c-000000@eu-west-1.amazonses.com>
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 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/examples/git-am.sh b/contrib/examples/git-am.sh index 3b77028..dd539f1 100755 --- a/contrib/examples/git-am.sh +++ b/contrib/examples/git-am.sh @@ -512,7 +512,7 @@ then git read-tree --reset -u $head_tree $head_tree && index_tree=$(git write-tree) && git read-tree -m -u $index_tree $head_tree - git read-tree $head_tree + git read-tree -m $head_tree ;; ,t) if test -f "$dotest/rebasing" -- https://github.com/git/git/pull/173