Autogenerated man pages for v1.4.0-rc1-gfd7e

[git.git] / man1 / git-read-tree.1

diff --git a/man1/git-read-tree.1 b/man1/git-read-tree.1
index c3662f5..0fedb5c 100755 (executable)
--- a/man1/git-read-tree.1
+++ b/man1/git-read-tree.1
@@ -238,7 +238,7 @@ You would normally use git\-merge\-index with supplied git\-merge\-one\-file to
 When you start a 3\-way merge with an index file that is already populated, it is assumed that it represents the state of the files in your work tree, and you can even have files with changes unrecorded in the index file\&. It is further assumed that this state is "derived" from the stage 2 tree\&. The 3\-way merge refuses to run if it finds an entry in the original index file that does not match stage 2\&.
 
 
-This is done to prevent you from losing your work\-in\-progress changes, and mixing your random changes in an unrelated merge commit\&. To illustrate, suppose you start from what has been commited last to your repository:
+This is done to prevent you from losing your work\-in\-progress changes, and mixing your random changes in an unrelated merge commit\&. To illustrate, suppose you start from what has been committed last to your repository:
 
 .nf
 $ JC=`git\-rev\-parse \-\-verify "HEAD^0"`