summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2012-07-23 01:29:14 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-23 09:41:29 -0700
commitf200197c39d9181c02cac06c26433edaa9d31219 (patch)
tree8e8e33bcafa340e4b91250bd9ec57f6260e6b2d0 /Documentation/merge-options.txt
parentblock-sha1: put expanded macro parameters in parentheses (diff)
downloadtgif-f200197c39d9181c02cac06c26433edaa9d31219.tar.xz
Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads
block-sha1/ is fast on most known platforms. Clarify the Makefile to be less misleading about that. Early versions of block-sha1/ explicitly relied on fast htonl() and fast 32-bit loads with arbitrary alignment. Now it uses those on some arches but the default behavior is byte-at-a-time access for the sake of arches like ARM, Alpha, and their kin and it is still pretty fast on these arches (fast enough to supersede the mozilla SHA1 implementation and the hand-written ARM assembler implementation that were bundled before). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions