From: Junio C Hamano Date: Wed, 5 Feb 2014 22:14:40 +0000 (-0800) Subject: Sync with 1.8.5.4 X-Git-Tag: v1.9.0-rc3~4 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/89ba81dc7643f5b126b15b15a8dcd3893d05ee47?ds=inline;hp=-c Sync with 1.8.5.4 --- 89ba81dc7643f5b126b15b15a8dcd3893d05ee47 diff --combined Documentation/git.txt index 274d816b43,36483181cb..03aaa10458 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -43,9 -43,10 +43,10 @@@ unreleased) version of Git, that is ava branch of the `git.git` repository. Documentation for older releases are available here: - * link:v1.8.5.3/git.html[documentation for release 1.8.5.3] + * link:v1.8.5.4/git.html[documentation for release 1.8.5.4] * release notes for + link:RelNotes/1.8.5.4.txt[1.8.5.4], link:RelNotes/1.8.5.3.txt[1.8.5.3], link:RelNotes/1.8.5.2.txt[1.8.5.2], link:RelNotes/1.8.5.1.txt[1.8.5.1], @@@ -808,15 -809,6 +809,15 @@@ temporary file --- it is removed when ' + For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 parameter, . ++ +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 ~~~~~