From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jul 2019 21:27:16 +0000 (-0700)
Subject: Merge branch 'ab/hash-object-doc' into maint
X-Git-Tag: v2.23.0-rc0~6^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/352253adf04cb474468a2bc31adde96cbf737f8c?hp=409813088ad55ae4a60f55412f6b5ba6a89d89e7

Merge branch 'ab/hash-object-doc' into maint

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 <type> is not
-specified, it defaults to "blob".
+When <type> is not specified, it defaults to "blob".
 
 OPTIONS
 -------