Merge branch 'da/mergetool-trust-exit-code' into maint

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 2cf7e225f56af05031aa6aebea50e921cde6c9d1..af191c51b1d63d995cfba0784de36d98a23de838 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,15 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v2.10.1/git.html[documentation for release 2.10.1]
+* link:v2.11.0/git.html[documentation for release 2.11]
 
 * release notes for
+  link:RelNotes/2.11.0.txt[2.11].
+
+* link:v2.10.2/git.html[documentation for release 2.10.2]
+
+* release notes for
+  link:RelNotes/2.10.2.txt[2.10.2],
   link:RelNotes/2.10.1.txt[2.10.1],
   link:RelNotes/2.10.0.txt[2.10].