Use Daniel's read-tree in the merge strategy 'resolve'.

diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index a77adab1438d5c99a31ad5b69f60af80460178dd..4dd06f7c896c685d73abca652ab84281dac97425 100644 (file)
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -17,7 +17,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-script" to update the cache
+This is used by "git-cvsimport" to update the cache
 without modifying files in the work tree.  When <type> is not
 specified, it defaults to "blob".