Merge fixes up to GIT 1.0.5

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index b92cf483152d7d393b20537d5407479aa13fefc1..8b91f221fe0ea4dacd1f373fbd90d023ddc766b3 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -66,6 +66,10 @@ OPTIONS
        Update specified paths in the index file before committing.
 
 
+If you make a commit and then found a mistake immediately after
+that, you can recover from it with gitlink:git-reset[1].
+
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and