X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-read-tree.txt;h=d6faa141495521b2f7281040364d540a7cf41bb3;hb=73d66323ac78c750ba42fef23b1cb8fd2110e023;hp=ea7b0b2f5c4630aebd6352cd2bd92fbfaef0863a;hpb=8740773ee5ef450cefd03d3576f348fe65e92edf;p=git.git diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index ea7b0b2f5..d6faa1414 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -148,7 +148,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: