revision: ignore side parents while running simplify-merges

diff --git a/Documentation/git.txt b/Documentation/git.txt
index f86ce05d1623d96a2b6299e8003046c3f7144ca3..55e405d644650394cc7826fd438a6a8e83e2bbf1 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.7.10.3/git.html[documentation for release 1.7.10.3]
+* link:v1.7.10.4/git.html[documentation for release 1.7.10.4]
 
 * release notes for
+  link:RelNotes/1.7.10.4.txt[1.7.10.4],
   link:RelNotes/1.7.10.3.txt[1.7.10.3],
   link:RelNotes/1.7.10.2.txt[1.7.10.2],
   link:RelNotes/1.7.10.1.txt[1.7.10.1],