X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-tree.html;fp=git-merge-tree.html;h=2ea075a728abf587465723b76b63779eb68f30bd;hb=54559c8b9d844fcbb8510673984390f766841b72;hp=0000000000000000000000000000000000000000;hpb=a8adb1ec550d7d7a66cd4d362cfbd01795d71f43;p=git.git diff --git a/git-merge-tree.html b/git-merge-tree.html new file mode 100644 index 00000000..2ea075a7 --- /dev/null +++ b/git-merge-tree.html @@ -0,0 +1,307 @@ + + + + + + +git-merge-tree(1) + + + +

SYNOPSIS

+
+

git-merge-tree <base-tree> <branch1> <branch2>

+
+

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 +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 +index. For this reason, the output from the command omits +entries that match <branch1> tree.

+
+

Author

+
+

Written by Linus Torvalds <torvalds@osdl.org>

+
+

Documentation

+
+

Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

+
+

GIT

+
+

Part of the git(7) suite

+
+ + +