X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-tree.txt;h=4cc0964e78b0719e0711214943f2ae2824cdbcce;hb=b4955fb611ce407ef0e522862c60ae0472dbfe5e;hp=35fb4fb713bac225c665b6d7701efc9f105b9c16;hpb=b8336519450fdedc8f9cafebc73f7a0226e34e1f;p=git.git diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index 35fb4fb71..f869a7f00 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -8,20 +8,20 @@ git-merge-tree - Show three-way merge without touching index SYNOPSIS -------- -'git-merge-tree' +'git merge-tree' 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 ------ @@ -33,5 +33,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the gitlink:git[7] suite - +Part of the linkgit:git[1] suite