From: Junio C Hamano Date: Mon, 13 Jan 2014 19:39:38 +0000 (-0800) Subject: Sync with 1.8.5.3 X-Git-Tag: v1.9-rc0~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/14598b907008dc9952428662a30ecfd74dc90a79?ds=inline;hp=-c Sync with 1.8.5.3 * maint: Git 1.8.5.3 pack-heuristics.txt: mark up the file header properly --- 14598b907008dc9952428662a30ecfd74dc90a79 diff --combined Documentation/git.txt index aec372646f,388b19633e..274d816b43 --- 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.2/git.html[documentation for release 1.8.5.2] + * link:v1.8.5.3/git.html[documentation for release 1.8.5.3] * release notes for + 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], link:RelNotes/1.8.5.txt[1.8.5]. @@@ -807,15 -808,6 +808,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 ~~~~~