Sync with 1.7.0 series

diff --cc Documentation/git.txt
index c4024d0edd9f77c49e6211c6950c6ccb775a70ff,46a215824e2e67a56f5791658cc231b5c60a2cfb..abbd9848e44b69904e0446dba46b694d118c366e
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,14 -43,10 +43,16 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.7.0.6/git.html[documentation for release 1.7.0.6]
++
 +* link:v1.7.1/git.html[documentation for release 1.7.1]
 +
 +* release notes for
 +  link:RelNotes-1.7.1.txt[1.7.1].
 +
+ * link:v1.7.0.7/git.html[documentation for release 1.7.0.7]
  
  * release notes for
+   link:RelNotes-1.7.0.7.txt[1.7.0.7],
    link:RelNotes-1.7.0.6.txt[1.7.0.6],
    link:RelNotes-1.7.0.5.txt[1.7.0.5],
    link:RelNotes-1.7.0.4.txt[1.7.0.4],

diff --cc path.c
Simple merge