summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-08-16 04:14:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-16 04:14:32 -0700
commit64d5fe0a23e3a16179c7c185662f25d85fe631dd (patch)
treedcaffa44b525c1e096836eb1ce2f8b5d264d918a /Documentation/howto/revert-a-faulty-merge.txt
parentMerge branch 'bc/maint-am-email' (diff)
parentblock-sha1/sha1.c: silence compiler complaints by casting void * to char * (diff)
downloadtgif-64d5fe0a23e3a16179c7c185662f25d85fe631dd.tar.xz
Merge branch 'lt/block-sha1'
* lt/block-sha1: block-sha1/sha1.c: silence compiler complaints by casting void * to char * block-sha1: more good unaligned memory access candidates block-sha1: support for architectures with memory alignment restrictions block-sha1: split the different "hacks" to be individually selected block-sha1: move code around block-sha1: improve code on large-register-set machines block-sha1: improved SHA1 hashing block-sha1: perform register rotation using cpp block-sha1: get rid of redundant 'lenW' context block-sha1: Use '(B&C)+(D&(B^C))' instead of '(B&C)|(D&(B|C))' in round 3 block-sha1: macroize the rounds a bit further block-sha1: re-use the temporary array as we calculate the SHA1 block-sha1: make the 'ntohl()' part of the first SHA1 loop block-sha1: minor fixups block-sha1: try to use rol/ror appropriately block-sha1: undo ctx->size change Add new optimized C 'block-sha1' routines
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions