X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Documentation%2Fgit-read-tree.txt;h=a10ce4ba40cc509a0f3a8f39551310fdd9231e71;hb=e8a285e553f8c6c04820a542b2a28816a9d62d3c;hp=4a932b08c6ed4f1de46d51fd92046d5190f831a7;hpb=ef3a4fd670a4874f9b598ef96b10b89117b806e1;p=git.git diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 4a932b08c..a10ce4ba4 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -144,7 +144,7 @@ Two Tree Merge 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: