gitweb: Show combined diff for merge commits in 'commit' view

diff --git a/Documentation/git.txt b/Documentation/git.txt
index c2b7f3fec6072eac2d9f8e1ae466cea9b54a291d..f84728bc111903a622c3c4da5d17a8c5b6bc1efa 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -40,7 +40,11 @@ Documentation for older releases are available here:
 
 * link:RelNotes-1.5.1.txt[release notes for 1.5.1]
 
-* link:v1.5.0.7/git.html[documentation for release 1.5.0.7]
+* link:v1.5.1.2/git.html[documentation for release 1.5.1.2]
+
+* link:RelNotes-1.5.1.2.txt[release notes for 1.5.1.2]
+
+* link:RelNotes-1.5.1.1.txt[release notes for 1.5.1.1]
 
 * link:RelNotes-1.5.0.7.txt[release notes for 1.5.0.7]
 
@@ -344,6 +348,7 @@ git Commits
 'GIT_COMMITTER_NAME'::
 'GIT_COMMITTER_EMAIL'::
 'GIT_COMMITTER_DATE'::
+'EMAIL'::
        see gitlink:git-commit-tree[1]
 
 git Diffs