Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 0dac7aab573b68e447eebd9102179b309030b62f..5a174bcfc5186c129cbbb182ff47c0599c10d395 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,6 +44,12 @@ 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.4.1/git.html[documentation for release 1.7.4.1]
+
+* release notes for
+  link:RelNotes/1.7.4.1.txt[1.7.4.1],
+  link:RelNotes/1.7.4.txt[1.7.4].
+
 * link:v1.7.3.5/git.html[documentation for release 1.7.3.5]
 
 * release notes for
@@ -613,7 +619,6 @@ where:
                          contents of <old|new>,
        <old|new>-hex:: are the 40-hexdigit SHA1 hashes,
        <old|new>-mode:: are the octal representation of the file modes.
-
 +
 The file parameters can point at the user's working file
 (e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`