Merge branch 'js/maint-am-skip-performance-regression' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Sep 2015 19:03:02 +0000 (12:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Sep 2015 19:03:02 +0000 (12:03 -0700)
commit02dad2673b2bea4d28ca1b79c2e40fb8ad170959
treea9c2d25b7d967768e76032ceb81d2ec864fdc278
parent27ea6f85beff1173ec74349fa35c45951feee570
parentb9d66899a992525f2de9436e160779844ecfa2f1
Merge branch 'js/maint-am-skip-performance-regression' into maint

* js/maint-am-skip-performance-regression:
  am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
git-am.sh