2 commits

Author	SHA1	Message	Date
Junio C Hamano	cf2094ca63	Merge branch 'js/maint-am-skip-performance-regression' ... Recent versions of scripted "git am" has a performance regression in "git am --skip" codepath, which no longer exists in the built-in version on the 'master' front. Fix the regression in the last scripted version that appear in 2.5.x maintenance track and older. * js/maint-am-skip-performance-regression: am --skip/--abort: merge HEAD/ORIG_HEAD tree into index	2015-09-14 14:59:13 -07:00
Paul Tan	783d7e865e	builtin-am: remove redirection to git-am.sh ... At the beginning of the rewrite of git-am.sh to C, in order to not break existing test scripts that depended on a functional git-am, a redirection to git-am.sh was introduced that would activate if the environment variable _GIT_USE_BUILTIN_AM was not defined. Now that all of git-am.sh's functionality has been re-implemented in builtin/am.c, remove this redirection, and retire git-am.sh into contrib/examples/. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2015-08-04 22:02:11 -07:00

Renamed from git-am.sh (Browse further)