summaryrefslogtreecommitdiffstats
path: root/gitattributes.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-11-15 10:02:56 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-11-15 10:02:56 +0000
commite1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (patch)
treea8daa09b76e908903adf7e40a61774563f24da72 /gitattributes.html
parent0ecfa0f3ad17b8a498a5c93dc403de943888e1b8 (diff)
downloadgit-htmldocs-e1b2683fe5d6d67aa52277a7a90966c3cec6ef93.tar.gz
Autogenerated HTML docs for v1.6.5.2-185-gb7fba
Diffstat (limited to 'gitattributes.html')
-rw-r--r--gitattributes.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/gitattributes.html b/gitattributes.html
index fd9ea821f..381eb2bc2 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 <em>not</em> suitable for applying. For this reason,
+textconv are _not_ 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 <em>in
-addition to</em> the usual binary diff that you might send.</td>
+should generate it separately and send it as a comment _in
+addition to_ 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>
@@ -1027,7 +1027,7 @@ frotz unspecified</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-10-22 03:08:50 UTC
+Last updated 2009-11-15 09:57:24 UTC
</div>
</div>
</body>