summaryrefslogtreecommitdiff
path: root/Documentation/git-hash-object.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-25 13:38:06 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-25 13:38:06 -0700
commit29313449f726f13ecc562cea9856645eade8e3e9 (patch)
tree431196c8d7047f2b857c699ef1bd8d84f8babe6c /Documentation/git-hash-object.txt
parent325566cc5d14a409bdbc76aac50344294961f143 (diff)
parent6c41e21d48c369f398ee2e24085e618b55ed916d (diff)
downloadgit-29313449f726f13ecc562cea9856645eade8e3e9.tar.gz
Merge branch 'ar/batch-cat'
* ar/batch-cat: change quoting in test t1006-cat-file.sh builtin-cat-file.c: use parse_options() git-svn: Speed up fetch Git.pm: Add hash_and_insert_object and cat_blob Git.pm: Add command_bidi_pipe and command_close_bidi_pipe git-hash-object: Add --stdin-paths option Add more tests for git hash-object Move git-hash-object tests from t5303 to t1007 git-cat-file: Add --batch option git-cat-file: Add --batch-check option git-cat-file: Make option parsing a little more flexible git-cat-file: Small refactor of cmd_cat_file Add tests for git cat-file
Diffstat (limited to 'Documentation/git-hash-object.txt')
-rw-r--r--Documentation/git-hash-object.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 33030c022f..99a21434b5 100644
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -8,7 +8,7 @@ git-hash-object - Compute object ID and optionally creates a blob from a file
SYNOPSIS
--------
-'git-hash-object' [-t <type>] [-w] [--stdin] [--] <file>...
+'git-hash-object' [-t <type>] [-w] [--stdin | --stdin-paths] [--] <file>...
DESCRIPTION
-----------
@@ -32,6 +32,9 @@ OPTIONS
--stdin::
Read the object from standard input instead of from a file.
+--stdin-paths::
+ Read file names from stdin instead of from the command-line.
+
Author
------
Written by Junio C Hamano <junkio@cox.net>