Autogenerated HTML docs for v1.5.3.1-40-g6972

diff --git a/git-pack-objects.html b/git-pack-objects.html
index c0db59d5b727378fa9029449ff01f6d7030b9c50..7a41e28545fa212563843cfa38c237288d2612ee 100644 (file)
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -498,12 +498,8 @@ base-name
         generated pack.  If not specified,  pack compression level is\r
         determined first by pack.compression,  then by core.compression,\r
         and defaults to -1,  the zlib default,  if neither is set.\r
-        Data copied from loose objects will be recompressed\r
-        if core.legacyheaders was true when they were created or if\r
-        the loose compression level (see core.loosecompression and\r
-        core.compression) is now a different value than the pack\r
-        compression level.  Add --no-reuse-object if you want to force\r
-        a uniform compression level on all data no matter the source.\r
+        Add --no-reuse-object if you want to force a uniform compression\r
+        level on all data no matter the source.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -554,7 +550,7 @@ base-name
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:47 UTC\r
+Last updated 10-Sep-2007 08:10:46 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-objects.txt b/git-pack-objects.txt
index 6f17cff24ab784ee68767724dff6892b67b3ad53..f8a0be351188f39e94c9ffa4dc9a1fcea367e290 100644 (file)
--- a/git-pack-objects.txt
+++ b/git-pack-objects.txt
@@ -155,12 +155,8 @@ base-name::
        generated pack.  If not specified,  pack compression level is
        determined first by pack.compression,  then by core.compression,
        and defaults to -1,  the zlib default,  if neither is set.
-       Data copied from loose objects will be recompressed
-       if core.legacyheaders was true when they were created or if
-       the loose compression level (see core.loosecompression and
-       core.compression) is now a different value than the pack
-       compression level.  Add --no-reuse-object if you want to force
-       a uniform compression level on all data no matter the source.
+       Add \--no-reuse-object if you want to force a uniform compression
+       level on all data no matter the source.
 
 --delta-base-offset::
        A packed archive can express base object of a delta as

diff --git a/gitattributes.html b/gitattributes.html
index 35a4820eade32f12dfa2489d1b0cf42e3f034a7c..5426ddf13ebf45ccbf44dddb4c603da091982ce9 100644 (file)
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -691,6 +691,17 @@ baz     set to false
 merge   set to string value "filfre"\r
 frotz   unspecified</tt></pre>\r
 </div></div>\r
+<h3>Creating an archive</h3>\r
+<h4><tt>export-subst</tt></h4>\r
+<p>If the attribute <tt>export-subst</tt> is set for a file then git will expand\r
+several placeholders when adding this file to an archive.  The\r
+expansion depends on the availability of a commit ID, i.e. if\r
+<a href="git-archive.html">git-archive(1)</a> has been given a tree instead of a commit or a\r
+tag then no replacement will be done.  The placeholders are the same\r
+as those for the option <tt>--pretty=format:</tt> of <a href="git-log.html">git-log(1)</a>,\r
+except that they need to be wrapped like this: <tt>$Format:PLACEHOLDERS$</tt>\r
+in the file.  E.g. the string <tt>$Format:%H$</tt> will be replaced by the\r
+commit hash.</p>\r
 </div>\r
 <h2>GIT</h2>\r
 <div class="sectionbody">\r
@@ -698,7 +709,7 @@ frotz   unspecified</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:15 UTC\r
+Last updated 10-Sep-2007 08:10:47 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitattributes.txt b/gitattributes.txt
index 46f9d591aa7a3af2235d29308d101b2bfa0bff56..d0e951ee6f1c391459f822b8ecbb4c1237b209db 100644 (file)
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -421,6 +421,23 @@ frotz      unspecified
 ----------------------------------------------------------------
 
 
+Creating an archive
+~~~~~~~~~~~~~~~~~~~
+
+`export-subst`
+^^^^^^^^^^^^^^
+
+If the attribute `export-subst` is set for a file then git will expand
+several placeholders when adding this file to an archive.  The
+expansion depends on the availability of a commit ID, i.e. if
+gitlink:git-archive[1] has been given a tree instead of a commit or a
+tag then no replacement will be done.  The placeholders are the same
+as those for the option `--pretty=format:` of gitlink:git-log[1],
+except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
+in the file.  E.g. the string `$Format:%H$` will be replaced by the
+commit hash.
+
+
 GIT
 ---
 Part of the gitlink:git[7] suite