diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-04-23 07:27:05 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-04-23 07:27:05 +0000 |
| commit | 9db95ca51bbcde0022088fa1dbbf7ac182d817fe (patch) | |
| tree | 62221f02d997467ab74c11a769372bd5c424c2e7 /gitattributes.html | |
| parent | e08c339b86b96a2b66a3b555ca71c654bf677341 (diff) | |
| download | git-htmldocs-9db95ca51bbcde0022088fa1dbbf7ac182d817fe.tar.gz | |
Autogenerated HTML docs for v1.5.2-rc0-1-g2cc31
Diffstat (limited to 'gitattributes.html')
| -rw-r--r-- | gitattributes.html | 33 |
1 files changed, 29 insertions, 4 deletions
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…</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>
|