Merge branch 'nd/large-blobs' into jch
commit6bcef127f405de263cdca2d4b4c489faf9b4f87e
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:33:59 +0000 (25 12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:33:59 +0000 (25 12:33 -0700)
treeb329f1b7287e90379c5e8fd5f7df81ac90ebce42
parent3a5c3aa2a979fb27e5a2ef3397ef908148d7a65b
parent1aaf69e669b7fd67073d3024b386ac25ac77d0f8
Merge branch 'nd/large-blobs' into jch

* nd/large-blobs:
  diff: shortcut for diff'ing two binary SHA-1 objects
  diff --stat: mark any file larger than core.bigfilethreshold binary
  diff.c: allow to pass more flags to diff_populate_filespec
  sha1_file.c: do not die failing to malloc in unpack_compressed_entry
  wrapper.c: introduce gentle xmallocz that does not die()
Documentation/config.txt
diff.c
git-compat-util.h
sha1_file.c
wrapper.c