git-merge-tree man page on YellowDog

git-merge-tree man page on YellowDog

Man page or keyword search:
man Server 18644 pages
apropos Keyword Search (all sections)
Output format

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
       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

Git 1.5.5.2			  10/21/2008		     GIT-MERGE-TREE(1)

[top]

List of man pages available for YellowDog

Copyright (c) for man pages and the logo by the respective OS vendor.

For those who want to learn more, the polarhome community provides shell access and support.

[legal] [privacy] [GNU] [policy] [cookies] [netiquette] [sponsors] [FAQ]

Polarhome, production since 1999.
Member of Polarhome portal.
Based on Fawad Halim's script.
....................................................................

Vote for polarhome