summaryrefslogtreecommitdiffstats
path: root/gitattributes.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-01 14:58:27 -0800
committerJunio C Hamano <gitster@pobox.com>2019-12-01 14:58:27 -0800
commit8ef91f31f6606a0370b18943c3b0f089e04873f9 (patch)
tree2bf27a3779a34fa4bf69dfc02e1fe1be848ea0d2 /gitattributes.html
parent8ac8a3d8dd001611b77776fa19ef37c2c87cd987 (diff)
downloadgit-htmldocs-8ef91f31f6606a0370b18943c3b0f089e04873f9.tar.gz
Autogenerated HTML docs for v2.24.0-308-g228f5
Diffstat (limited to 'gitattributes.html')
-rw-r--r--gitattributes.html13
1 files changed, 9 insertions, 4 deletions
diff --git a/gitattributes.html b/gitattributes.html
index 7b5921309..e2209959e 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -1079,10 +1079,10 @@ built-in Git text processing tools (e.g. <em>git diff</em>) as well as most Git
web front ends do not visualize the contents of these files by default.</p></div>
<div class="paragraph"><p>In these cases you can tell Git the encoding of a file in the working
directory with the <code>working-tree-encoding</code> attribute. If a file with this
-attribute is added to Git, then Git reencodes the content from the
+attribute is added to Git, then Git re-encodes the content from the
specified encoding to UTF-8. Finally, Git stores the UTF-8 encoded
content in its internal data structure (called "the index"). On checkout
-the content is reencoded back to the specified encoding.</p></div>
+the content is re-encoded back to the specified encoding.</p></div>
<div class="paragraph"><p>Please note that using the <code>working-tree-encoding</code> attribute may have a
number of pitfalls:</p></div>
<div class="ulist"><ul>
@@ -1268,7 +1268,7 @@ command. This is achieved by using the long-running process protocol
<div class="paragraph"><p>When Git encounters the first file that needs to be cleaned or smudged,
it starts the filter and performs the handshake. In the handshake, the
welcome message sent by Git is "git-filter-client", only version 2 is
-suppported, and the supported capabilities are "clean", "smudge", and
+supported, and the supported capabilities are "clean", "smudge", and
"delay".</p></div>
<div class="paragraph"><p>Afterwards Git sends a list of "key=value" pairs terminated with
a flush packet. The list will contain at least the filter command
@@ -1596,6 +1596,11 @@ patterns are available:</p></div>
</li>
<li>
<p>
+<code>elixir</code> suitable for source code in the Elixir language.
+</p>
+</li>
+<li>
+<p>
<code>fortran</code> suitable for source code in the Fortran language.
</p>
</li>
@@ -2165,7 +2170,7 @@ frotz unspecified</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2019-09-19 04:25:17 JST
+ 2019-12-01 14:55:34 PST
</div>
</div>
</body>