Sync with 1.8.5.3

* maint:
Git 1.8.5.3
pack-heuristics.txt: mark up the file header properly

diff --combined Documentation/git.txt
index aec372646ffc30f13b924159d47ade373fc44b87,388b19633ea21cbf1e66bb32d7d08c7fcda4b890..274d816b438137dd47a121d4f4ca2171abb0cbc2
--- 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.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, <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
  ~~~~~