From: Junio C Hamano Date: Fri, 21 Jun 2019 18:24:11 +0000 (-0700) Subject: Merge branch 'ab/hash-object-doc' X-Git-Tag: v2.23.0-rc0~100 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/755793bf57a6aa40cb4d9702355703fb059da37b?hp=88542ef306fc8821a3aa8a74d238c2a9bc667132 Merge branch 'ab/hash-object-doc' Doc update. * ab/hash-object-doc: hash-object doc: stop mentioning git-cvsimport --- diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt index 814e74406a..df9e2c58bd 100644 --- a/Documentation/git-hash-object.txt +++ b/Documentation/git-hash-object.txt @@ -18,9 +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 -without modifying files in the work tree. When is not -specified, it defaults to "blob". +When is not specified, it defaults to "blob". OPTIONS -------