summaryrefslogtreecommitdiffstats
path: root/gitattributes.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-11-15 08:07:55 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-11-15 08:07:55 +0000
commitd3452a0b887b74a3c7ce37ba11453e80ccb3aad6 (patch)
tree5107c80123b2f4e8ae4f1554a24ae35decd8456b /gitattributes.html
parent283634923aa8f124696f3e9a77a012b96493c2d7 (diff)
downloadgit-htmldocs-d3452a0b887b74a3c7ce37ba11453e80ccb3aad6.tar.gz
Autogenerated HTML docs for v1.6.0.4-735-gea4f
Diffstat (limited to 'gitattributes.html')
-rw-r--r--gitattributes.html12
1 files changed, 11 insertions, 1 deletions
diff --git a/gitattributes.html b/gitattributes.html
index b2cb8a577..3cdcdd253 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -898,6 +898,16 @@ 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="_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
+be used by GUI tools (e.g. <a href="gitk.html">gitk(1)</a> and <a href="git-gui.html">git-gui(1)</a>) to
+display the contents of the relevant file. Note that due to performance
+considerations <a href="gitk.html">gitk(1)</a> does not use this attribute unless you
+manually enable per-file encodings in its options.</p></div>
+<div class="para"><p>If this attribute is not set or has an invalid value, the value of the
+<tt>gui.encoding</tt> configuration variable is used instead
+(See <a href="git-config.html">git-config(1)</a>).</p></div>
</div>
<h2 id="_using_attribute_macros">USING ATTRIBUTE MACROS</h2>
<div class="sectionbody">
@@ -990,7 +1000,7 @@ frotz unspecified</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-11-14 08:26:11 UTC
+Last updated 2008-11-15 08:07:38 UTC
</div>
</div>
</body>