diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-21 17:33:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-21 17:33:15 -0700 |
| commit | 3694209ca16c033fb4c539cc23b0b370e48952dd (patch) | |
| tree | fdabce5e6ed086ae3de8e1adda98eb7efafeeba8 /Documentation | |
| parent | 8e850a4dbdcda5e7be8367d81fef3f70da0e8294 (diff) | |
| parent | 975457f185acd7c1f96ccff67cd5dc8dcb7908a0 (diff) | |
| download | git-3694209ca16c033fb4c539cc23b0b370e48952dd.tar.gz git-3694209ca16c033fb4c539cc23b0b370e48952dd.tar.xz | |
Merge branch 'maint'
* maint:
Document `delta` attribute in "git help attributes".
Mark files in t/t5100 as UTF-8
Remove a left-over file from t/t5100
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitattributes.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 1195e83b6..1f472cea5 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -560,6 +560,16 @@ in the file. E.g. the string `$Format:%H$` will be replaced by the commit hash. +Packing objects +~~~~~~~~~~~~~~~ + +`delta` +^^^^^^^ + +Delta compression will not be attempted for blobs for paths with the +attribute `delta` set to false. + + Viewing files in GUI tools ~~~~~~~~~~~~~~~~~~~~~~~~~~ |