Sync with 1.8.5.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --combined Documentation/git.txt
index 03aaa10458fa56792ef7fb57dabbb0ad64df8777,64da795aba252d53e9fd9c11e6eb7d39397ff805..795015269bbdfe85c65c04a2895c9d7d64778ddf
--- 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.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, <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
  ~~~~~