diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-27 16:33:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 16:33:16 -0800 |
| commit | b1acf0200aa1efd66d18ed4e108792e1068464a9 (patch) | |
| tree | cbe03352fd89f04dad76fcd2c16544999ae21cbf /git.html | |
| parent | cf77b0414a44eadfcd0c74dfcae739427b7d2cce (diff) | |
| download | git-htmldocs-b1acf0200aa1efd66d18ed4e108792e1068464a9.tar.gz | |
Autogenerated HTML docs for v1.8.5.2-227-g53f347
Diffstat (limited to 'git.html')
| -rw-r--r-- | git.html | 20 |
1 files changed, 19 insertions, 1 deletions
@@ -2527,6 +2527,24 @@ index). <em>GIT_EXTERNAL_DIFF</em> should not worry about unlinking the temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p></div>
<div class="paragraph"><p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1
parameter, <path>.</p></div>
+<div class="paragraph"><p>For each path <em>GIT_EXTERNAL_DIFF</em> is called, two environment variables,
+<em>GIT_DIFF_PATH_COUNTER</em> and <em>GIT_DIFF_PATH_TOTAL</em> are set.</p></div>
+</dd>
+<dt class="hdlist1">
+<em>GIT_DIFF_PATH_COUNTER</em>
+</dt>
+<dd>
+<p>
+ A 1-based counter incremented by one for every path.
+</p>
+</dd>
+<dt class="hdlist1">
+<em>GIT_DIFF_PATH_TOTAL</em>
+</dt>
+<dd>
+<p>
+ The total number of paths.
+</p>
</dd>
</dl></div>
</div>
@@ -2834,7 +2852,7 @@ subscribed to the list to send a message there.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-12-03 14:06:33 PST
+Last updated 2013-12-27 16:32:55 PST
</div>
</div>
</body>
|