From c16e30c0884549d48a73d7f2ebbbb470a0e1576b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 13 Apr 2006 00:09:54 -0700 Subject: Documentation: add a couple of missing docs. Signed-off-by: Junio C Hamano --- Documentation/git-merge-tree.txt | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 Documentation/git-merge-tree.txt (limited to 'Documentation/git-merge-tree.txt') diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt new file mode 100644 index 0000000000..35fb4fb713 --- /dev/null +++ b/Documentation/git-merge-tree.txt @@ -0,0 +1,37 @@ +git-merge-tree(1) +================= + +NAME +---- +git-merge-tree - Show three-way merge without touching index + + +SYNOPSIS +-------- +'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 +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 tree. + +Author +------ +Written by Linus Torvalds + +Documentation +-------------- +Documentation by Junio C Hamano and the git-list . + +GIT +--- +Part of the gitlink:git[7] suite + -- cgit v1.2.3