index ea7b0b2f5c4630aebd6352cd2bd92fbfaef0863a..d6faa141495521b2f7281040364d540a7cf41bb3 100644 (file)
Typically, this is invoked as `git read-tree -m $H $M`, where $H
is the head commit of the current repository, and $M is the head
of a foreign tree, which is simply ahead of $H (i.e. we are in a
-fast forward situation).
+fast-forward situation).
When two trees are specified, the user is telling 'git-read-tree'
the following: