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

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