X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-tree.txt;h=f869a7f00fa812bed068f5b60bd970d4dcac0655;hb=f7af75777fd5a217d43acb2098cf043a73c20b01;hp=dbb0c18668ff0fb60c31c12b02c27d92b430c24a;hpb=35d2f73b999636c93049b2d7bed1458bcf2f9648;p=git.git diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index dbb0c1866..f869a7f00 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -14,14 +14,14 @@ DESCRIPTION ----------- Reads three treeish, and output trivial merge results and conflicting stages to the standard output. This is similar to -what three-way read-tree -m does, but instead of storing the +what three-way 'git read-tree -m' does, but instead of storing the results in the index, the command outputs the entries to the standard output. This is meant to be used by higher level scripts to compute -merge results outside index, and stuff the results back into the +merge results outside of the index, and stuff the results back into the index. For this reason, the output from the command omits -entries that match tree. +entries that match the tree. Author ------