From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 23 Apr 2007 07:27:05 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.5.2-rc0-1-g2cc31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9db95ca51bbcde0022088fa1dbbf7ac182d817fe;p=git.git

Autogenerated HTML docs for v1.5.2-rc0-1-g2cc31
---

diff --git a/gitattributes.html b/gitattributes.html
index 071fab7fd..53f5b37a4 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -442,9 +442,34 @@ Unspecified
         generate <tt>Binary files differ</tt>.
 </p>
 </dd>
+<dt>
+String
+</dt>
+<dd>
+<p>
+        Diff is shown using the specified custom diff driver.
+        The driver program is given its input using the same
+        calling convention as used for GIT_EXTERNAL_DIFF
+        program.
+</p>
+</dd>
 </dl>
-<p>Any other value set to <tt>diff</tt> attribute is ignored and git acts
-as if the attribute is left unspecified.</p>
+<h4>Defining a custom diff driver</h4>
+<p>The definition of a diff driver is done in <tt>gitconfig</tt>, not
+<tt>gitattributes</tt> file, so strictly speaking this manual page is a
+wrong place to talk about it.  However&#8230;</p>
+<p>To define a custom diff driver <tt>jcdiff</tt>, add a section to your
+<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>[diff "jcdiff"]
+        command = j-c-diff</tt></pre>
+</div></div>
+<p>When git needs to show you a diff for the path with <tt>diff</tt>
+attribute set to <tt>jcdiff</tt>, it calls the command you specified
+with the above configuration, i.e. <tt>j-c-diff</tt>, with 7
+parameters, just like <tt>GIT_EXTERNAL_DIFF</tt> program is called.
+See <a href="git.html">git(7)</a> for details.</p>
 <h3>Performing a three-way merge</h3>
 <p>The attribute <tt>merge</tt> affects how three versions of a file is
 merged when a file-level merge is necessary during <tt>git merge</tt>,
@@ -484,7 +509,7 @@ Unspecified
 </p>
 </dd>
 <dt>
-Any other string value
+String
 </dt>
 <dd>
 <p>
@@ -589,7 +614,7 @@ frotz   unspecified</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 22-Apr-2007 07:22:00 UTC
+Last updated 23-Apr-2007 07:26:51 UTC
 </div>
 </div>
 </body>
diff --git a/gitattributes.txt b/gitattributes.txt
index 126871756..d2edb9b14 100644
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -151,8 +151,34 @@ Unspecified::
 	text, it is treated as text.  Otherwise it would
 	generate `Binary files differ`.
 
-Any other value set to `diff` attribute is ignored and git acts
-as if the attribute is left unspecified.
+String::
+
+	Diff is shown using the specified custom diff driver.
+	The driver program is given its input using the same
+	calling convention as used for GIT_EXTERNAL_DIFF
+	program.
+
+
+Defining a custom diff driver
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The definition of a diff driver is done in `gitconfig`, not
+`gitattributes` file, so strictly speaking this manual page is a
+wrong place to talk about it.  However...
+
+To define a custom diff driver `jcdiff`, add a section to your
+`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this:
+
+----------------------------------------------------------------
+[diff "jcdiff"]
+	command = j-c-diff
+----------------------------------------------------------------
+
+When git needs to show you a diff for the path with `diff`
+attribute set to `jcdiff`, it calls the command you specified
+with the above configuration, i.e. `j-c-diff`, with 7
+parameters, just like `GIT_EXTERNAL_DIFF` program is called.
+See gitlink:git[7] for details.
 
 
 Performing a three-way merge
@@ -183,7 +209,7 @@ Unspecified::
 	different merge driver to be used for paths to which the
 	`merge` attribute is unspecified.
 
-Any other string value::
+String::
 
 	3-way merge is performed using the specified custom
 	merge driver.  The built-in 3-way merge driver can be