Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix-rename-leak' into next

diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 07d2c427c5d5364e4a1aad6ffa437361cc8f99ed..0924931dc136a5dbde95b666035c752cd6d3c549 100644 (file)
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -8,7 +8,7 @@ git-hash-object - Computes 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>