diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:49 -0800 |
| commit | add0951ab0bee43b5f634d1be68a7a80f627c18f (patch) | |
| tree | 084fe451a6b0c7d68d8d16c4ea9f64c38d9e01b0 /Documentation/git-hash-object.txt | |
| parent | 5fc9df08b564aa9d11265ad591f9ef104695ce2b (diff) | |
| parent | 0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63 (diff) | |
| download | git-add0951ab0bee43b5f634d1be68a7a80f627c18f.tar.gz git-add0951ab0bee43b5f634d1be68a7a80f627c18f.tar.xz | |
Merge remote branch 'remotes/trast-doc/for-next'
* remotes/trast-doc/for-next:
Documentation: spell 'git cmd' without dash throughout
Documentation: format full commands in typewriter font
Documentation: warn prominently against merging with dirty trees
Documentation/git-merge: reword references to "remote" and "pull"
Conflicts:
Documentation/config.txt
Documentation/git-config.txt
Documentation/git-merge.txt
Diffstat (limited to 'Documentation/git-hash-object.txt')
| -rw-r--r-- | Documentation/git-hash-object.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt index 0af40cfb8..479fce469 100644 --- a/Documentation/git-hash-object.txt +++ b/Documentation/git-hash-object.txt @@ -18,7 +18,7 @@ Computes the object ID value for an object with specified type with the contents of the named file (which can be outside of the work tree), and optionally writes the resulting object into the object database. Reports its object ID to its standard output. -This is used by 'git-cvsimport' to update the index +This is used by 'git cvsimport' to update the index without modifying files in the work tree. When <type> is not specified, it defaults to "blob". |