Merge from gitk

diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 8790d19b2fee26ae5b7b04d0267ed3565908a514..a77adab1438d5c99a31ad5b69f60af80460178dd 100644 (file)
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -21,6 +21,14 @@ This is used by "git-cvsimport-script" to update the cache
 without modifying files in the work tree.  When <type> is not
 specified, it defaults to "blob". 
 
+OPTIONS
+-------
+
+-t <type>::
+       Specify the type (default: "blob").
+
+-w::
+       Actually write the object into the object database.
 
 Author
 ------