Merge branch 'jc/add'

diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 07d2c427c5d5364e4a1aad6ffa437361cc8f99ed..5edc36f060f7cf6444dd016cbb7e073af923f5db 100644 (file)
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -3,12 +3,12 @@ git-hash-object(1)
 
 NAME
 ----
-git-hash-object - Computes object ID and optionally creates a blob from a file.
+git-hash-object - Compute object ID and optionally creates a blob from a file
 
 
 SYNOPSIS
 --------
-'git-hash-object' [-t <type>] [-w] <any-file-on-the-filesystem>
+'git-hash-object' [-t <type>] [-w] [--stdin] [--] <file>...
 
 DESCRIPTION
 -----------
@@ -29,6 +29,9 @@ OPTIONS
 -w::
        Actually write the object into the object database.
 
+--stdin::
+       Read the object from standard input instead of from a file.
+
 Author
 ------
 Written by Junio C Hamano <junkio@cox.net>