X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-tree.txt;h=f869a7f00fa812bed068f5b60bd970d4dcac0655;hb=90c3302173c5a02189f5fe9091c0d07f7b7ebe89;hp=b785e0f6e0c02ef688d4c6a60e19939aafd1a8d3;hpb=159e639e5bf24d78b22802934ae335413b2aa6ae;p=git.git diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index b785e0f6e..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 ------