Merge branch 'jk/mark-edges-uninteresting'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 388b19633ea21cbf1e66bb32d7d08c7fcda4b890..274d816b438137dd47a121d4f4ca2171abb0cbc2 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -808,6 +808,15 @@ temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.
 +
 For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
 parameter, <path>.
++
+For each path 'GIT_EXTERNAL_DIFF' is called, two environment variables,
+'GIT_DIFF_PATH_COUNTER' and 'GIT_DIFF_PATH_TOTAL' are set.
+
+'GIT_DIFF_PATH_COUNTER'::
+       A 1-based counter incremented by one for every path.
+
+'GIT_DIFF_PATH_TOTAL'::
+       The total number of paths.
 
 other
 ~~~~~