Sync with 1.5.4.2 and start 1.5.5 Release Notes

diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index 1a432f231970e4eb06ee9bad0cc7a4b550d17762..f16cb986122c8560622bfbceebc325ee4d27b768 100644 (file)
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -65,8 +65,10 @@ index file and all SHA1 references in .git/refs/* as heads.
        Be chatty.
 
 --lost-found::
-       Write dangling refs into .git/lost-found/commit/ or
-       .git/lost-found/other/, depending on type.
+       Write dangling objects into .git/lost-found/commit/ or
+       .git/lost-found/other/, depending on type.  If the object is
+       a blob, the contents are written into the file, rather than
+       its object name.
 
 It tests SHA1 and general object sanity, and it does full tracking of
 the resulting reachability and everything else. It prints out any
@@ -148,4 +150,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite