Mac Developer Library Developer
Search

 

This manual page is part of Xcode Tools version 5.0

To obtain these tools:

If you are running a version of Xcode Tools other than 5.0, view the documentation locally:

  • In Xcode

  • In Terminal, using the man(1) command

Reading manual pages

Manual pages are intended as a quick reference for people who already understand a technology.

  • To learn how the manual is organized or to learn about command syntax, read the manual page for manpages(5).

  • For more information about this technology, look for other documentation in the Apple Developer Library.

  • For general information about writing shell scripts, read Shell Scripting Primer.



GIT-MERGE-TREE(1)                                Git Manual                                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 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
       Part of the git(1) suite



Git 1.8.3                                        05/24/2013                                GIT-MERGE-TREE(1)

Reporting Problems

The way to report a problem with this manual page depends on the type of problem:

Content errors
Report errors in the content of this documentation with the feedback links below.
Bug reports
Report bugs in the functionality of the described tool or API through Bug Reporter.
Formatting problems
Report formatting mistakes in the online version of these pages with the feedback links below.

Feedback