diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-04-13 07:45:12 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-04-13 07:45:12 +0000 |
| commit | 54559c8b9d844fcbb8510673984390f766841b72 (patch) | |
| tree | be3d52526f263979e0da2c214499b4397b80f628 /git-merge-tree.txt | |
| parent | a8adb1ec550d7d7a66cd4d362cfbd01795d71f43 (diff) | |
| download | git-htmldocs-54559c8b9d844fcbb8510673984390f766841b72.tar.gz | |
Autogenerated HTML docs for v1.3.0-rc3-gd53352
Diffstat (limited to 'git-merge-tree.txt')
| -rw-r--r-- | git-merge-tree.txt | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/git-merge-tree.txt b/git-merge-tree.txt new file mode 100644 index 000000000..35fb4fb71 --- /dev/null +++ b/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' <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 gitlink:git[7] suite + |