summaryrefslogtreecommitdiff
path: root/block-sha1/sha1.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-14 14:59:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-14 14:59:13 -0700
commitcf2094ca6349fe8cfe0f327e36ea386ad8ac98db (patch)
treeebb512ac6e35945124a5afe7f6004d5172feeedc /block-sha1/sha1.h
parentMerge branch 'ah/show-ref-usage-string' (diff)
parentam --skip/--abort: merge HEAD/ORIG_HEAD tree into index (diff)
downloadtgif-cf2094ca6349fe8cfe0f327e36ea386ad8ac98db.tar.xz
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
Diffstat (limited to 'block-sha1/sha1.h')
0 files changed, 0 insertions, 0 deletions