X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-read-tree.txt;h=8b91847856b51fbe6727ad96e6d5e4d1fd00c815;hb=562051809589574576971c53c23aad93f8c395d9;hp=e219c6a78896f68f4720b189aa89514e7e108fb3;hpb=5f3aa197ac03eabbc45046cd3b9dbcfbda0426d9;p=git.git

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index e219c6a7..8b918478 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -30,6 +30,10 @@ OPTIONS
 -m::
 	Perform a merge, not just a read.
 
+--reset::
+
+        Same as -m except that unmerged entries will be silently ignored.
+
 -u::
 	After a successful merge, update the files in the work
 	tree with the result of the merge.
@@ -233,7 +237,7 @@ This is done to prevent you from losing your work-in-progress
 changes.  To illustrate, suppose you start from what has been
 commited last to your repository:
 
-    $ JC=`cat .git/HEAD`
+    $ JC=`git-rev-parse --verify "HEAD^0"`
     $ git-checkout-index -f -u -a $JC
 
 You do random edits, without running git-update-index.  And then