Sync with 1.8.5.4

diff --combined Documentation/git.txt
index 274d816b438137dd47a121d4f4ca2171abb0cbc2,36483181cb3ec884bf8d4cf9ce59d502d066e42f..03aaa10458fa56792ef7fb57dabbb0ad64df8777
--- 1/Documentation/git.txt
--- 2/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, <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
  ~~~~~