Merge branch 'sg/clean-nested-repo-with-ignored'

diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 814e74406ae4fb6ac68213df1f7e8e0192d1dbaf..df9e2c58bdbc5f31edaf25577df744868e16f3de 100644 (file)
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -18,9 +18,7 @@ Computes the object ID value for an object with specified type
 with the contents of the named file (which can be outside of the
 work tree), and optionally writes the resulting object into the
 object database.  Reports its object ID to its standard output.
-This is used by 'git cvsimport' to update the index
-without modifying files in the work tree.  When <type> is not
-specified, it defaults to "blob".
+When <type> is not specified, it defaults to "blob".
 
 OPTIONS
 -------