development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/maint-am-skip-performance-regression' into maint

Browse source 
* js/maint-am-skip-performance-regression:
  am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
This commit is contained in:
Junio C Hamano 2015-09-17 12:03:02 -07:00
parent 27ea6f85be b9d66899a9
commit 02dad2673b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-am.sh
View file

@ -510,7 +510,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"