NAME | SYNOPSIS | DESCRIPTION | GIT | COLOPHON

GIT-MERGE-TREE(1)                Git Manual                GIT-MERGE-TREE(1)

NAME         top

       git-merge-tree - Show three-way merge without touching index

SYNOPSIS         top

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

DESCRIPTION         top

       Reads three tree-ish, and output trivial merge results and
       conflicting stages to the standard output. This is similar to 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 of the index, and stuff the results back into the
       index. For this reason, the output from the command omits entries
       that match the <branch1> tree.

GIT         top

       Part of the git(1) suite

COLOPHON         top

       This page is part of the git (Git distributed version control system)
       project.  Information about the project can be found at 
       ⟨http://git-scm.com/⟩.  If you have a bug report for this manual page,
       see ⟨http://git-scm.com/community⟩.  This page was obtained from the
       project's upstream Git repository ⟨https://github.com/git/git.git⟩ on
       2017-11-25.  (At that time, the date of the most recent commit that
       was found in the repository was 2017-11-21.)  If you discover any
       rendering problems in this HTML version of the page, or you believe
       there is a better or more up-to-date source for the page, or you have
       corrections or improvements to the information in this COLOPHON
       (which is not part of the original manual page), send a mail to
       man-pages@man7.org

Git 2.7.0.rc1.5.gf3a             12/17/2015                GIT-MERGE-TREE(1)

Pages that refer to this page: git(1)