diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:33 -0700 |
| commit | bedd3b4b7b25df0b994abf444ee2136995dfeffa (patch) | |
| tree | 1f5866f73cce9cf92d602f8d61fb6a52d1c3d3c9 /Documentation/gitattributes.txt | |
| parent | 08ad26a63deaa7eaaaa987ed2cc84ac0f83c080b (diff) | |
| parent | 1aaf69e669b7fd67073d3024b386ac25ac77d0f8 (diff) | |
| download | git-bedd3b4b7b25df0b994abf444ee2136995dfeffa.tar.xz | |
Merge branch 'nd/large-blobs'
Teach a few codepaths to punt (instead of dying) when large blobs
that would not fit in core are involved in the operation.
* 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()
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 643c1ba929..9b45bda748 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -440,8 +440,8 @@ Unspecified:: A path to which the `diff` attribute is unspecified first gets its contents inspected, and if it looks like - text, it is treated as text. Otherwise it would - generate `Binary files differ`. + text and is smaller than core.bigFileThreshold, it is treated + as text. Otherwise it would generate `Binary files differ`. String:: |