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.txt | |
| parent | cf77b0414a44eadfcd0c74dfcae739427b7d2cce (diff) | |
| download | git-htmldocs-b1acf0200aa1efd66d18ed4e108792e1068464a9.tar.gz | |
Autogenerated HTML docs for v1.8.5.2-227-g53f347
Diffstat (limited to 'git.txt')
| -rw-r--r-- | git.txt | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -807,6 +807,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 ~~~~~ |