diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-20 04:43:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-20 04:43:25 (GMT) |
| commit | d8eec50468a64b23e1013bac9e78fc447af046ca (patch) | |
| tree | 5cd07dd03ae0976538aec276ab559c8169d3f0d5 /Documentation | |
| parent | 614eef259f0e805c7f656e1684b6a7ae56e1ee40 (diff) | |
| parent | 4a3d85dcf6722b7e5d16b5b1f69b51e39ad5f1dc (diff) | |
| download | git-d8eec50468a64b23e1013bac9e78fc447af046ca.zip git-d8eec50468a64b23e1013bac9e78fc447af046ca.tar.gz git-d8eec50468a64b23e1013bac9e78fc447af046ca.tar.bz2 | |
Merge branch 'dp/hash-literally'
* dp/hash-literally:
add --no-filters option to git hash-object
add --path option to git hash-object
use parse_options() in git hash-object
correct usage help string for git-hash-object
correct argument checking test for git hash-object
teach index_fd to work with pipes
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-hash-object.txt | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt index ac928e1..0af40cf 100644 --- a/Documentation/git-hash-object.txt +++ b/Documentation/git-hash-object.txt @@ -8,7 +8,9 @@ git-hash-object - Compute object ID and optionally creates a blob from a file SYNOPSIS -------- -'git hash-object' [-t <type>] [-w] [--stdin | --stdin-paths] [--] <file>... +[verse] +'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] <file>... +'git hash-object' [-t <type>] [-w] --stdin-paths < <list-of-paths> DESCRIPTION ----------- @@ -35,6 +37,22 @@ OPTIONS --stdin-paths:: Read file names from stdin instead of from the command-line. +--path:: + Hash object as it were located at the given path. The location of + file does not directly influence on the hash value, but path is + used to determine what git filters should be applied to the object + before it can be placed to the object database, and, as result of + applying filters, the actual blob put into the object database may + differ from the given file. This option is mainly useful for hashing + temporary files located outside of the working directory or files + read from stdin. + +--no-filters:: + Hash the contents as is, ignoring any input filter that would + have been chosen by the attributes mechanism, including crlf + conversion. If the file is read from standard input then this + is always implied, unless the --path option is given. + Author ------ Written by Junio C Hamano <gitster@pobox.com> |