projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbf64e1 f200197)
Merge branch 'jn/block-sha1' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:40:00 +0000 (15:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:40:00 +0000 (15:40 -0700)
* jn/block-sha1:
  Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads
  block-sha1: put expanded macro parameters in parentheses
  block-sha1: avoid pointer conversion that violates alignment constraints

1  2 
Makefile patch | diff1 | diff2 | blob | history
block-sha1/sha1.c patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc block-sha1/sha1.c
Simple merge
Git—the stupid content tracker