Autogenerated HTML docs for v1.6.5.1-69-g36942

1 files changed, 8 insertions, 4 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 87882ce8e..fd9ea821f 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -731,14 +731,14 @@ exif tool installed), add the following section to your
 <td class="content">The text conversion is generally a one-way conversion;

 in this example, we lose the actual image contents and focus

 just on the text data. This means that diffs generated by

-textconv are _not_ suitable for applying. For this reason,

+textconv are <em>not</em> suitable for applying. For this reason,

 only <tt>git diff</tt> and the <tt>git log</tt> family of commands (i.e.,

 log, whatchanged, show) will perform text conversion. <tt>git

 format-patch</tt> will never generate this output. If you want to

 send somebody a text-converted diff of a binary file (e.g.,

 because it quickly conveys the changes you have made), you

-should generate it separately and send it as a comment _in

-addition to_ the usual binary diff that you might send.</td>

+should generate it separately and send it as a comment <em>in

+addition to</em> the usual binary diff that you might send.</td>

 </tr></table>

 </div>

 <h3 id="_performing_a_three_way_merge">Performing a three-way merge</h3><div style="clear:left"></div>

@@ -921,6 +921,10 @@ as those for the option <tt>--pretty=format:</tt> of <a href="git-log.html">git-
 except that they need to be wrapped like this: <tt>$Format:PLACEHOLDERS$</tt>

 in the file.  E.g. the string <tt>$Format:%H$</tt> will be replaced by the

 commit hash.</p></div>

+<h3 id="_packing_objects">Packing objects</h3><div style="clear:left"></div>

+<h4 id="_tt_delta_tt"><tt>delta</tt></h4>

+<div class="para"><p>Delta compression will not be attempted for blobs for paths with the

+attribute <tt>delta</tt> set to false.</p></div>

 <h3 id="_viewing_files_in_gui_tools">Viewing files in GUI tools</h3><div style="clear:left"></div>

 <h4 id="_tt_encoding_tt"><tt>encoding</tt></h4>

 <div class="para"><p>The value of this attribute specifies the character encoding that should

@@ -1023,7 +1027,7 @@ frotz   unspecified</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-08-13 01:22:28 UTC

+Last updated 2009-10-22 03:08:50 UTC

 </div>

 </div>

 </body>