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
git-mirror · Oct 22, 2009 · 3694209 · 3694209
2 parents 8e850a4 + 975457f
commit 3694209
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 35 deletions.
diff --git 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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/t/t5100/.gitattributes b/t/t5100/.gitattributes
@@ -0,0 +1,4 @@
+msg*	encoding=UTF-8
+info*	encoding=UTF-8
+rfc2047-info-*	encoding=UTF-8
+sample.mbox	encoding=UTF-8
diff --git a/t/t5100/0010 b/t/t5100/0010