From: Junio C Hamano Date: Thu, 13 Feb 2014 21:42:26 +0000 (-0800) Subject: Sync with 1.8.5.5 X-Git-Tag: v1.9.0~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/475c52b7ac59bb5d2f955bd68c069622d9575d50?ds=inline;hp=-c Sync with 1.8.5.5 Signed-off-by: Junio C Hamano --- 475c52b7ac59bb5d2f955bd68c069622d9575d50 diff --combined Documentation/git.txt index 03aaa10458,64da795aba..795015269b --- 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.4/git.html[documentation for release 1.8.5.4] + * link:v1.8.5.5/git.html[documentation for release 1.8.5.5] * release notes for + link:RelNotes/1.8.5.5.txt[1.8.5.5], 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], @@@ -809,15 -810,6 +810,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 ~~~~~