Skip site navigation (1)Skip section navigation (2)

FreeBSD Manual Pages

  
 
  

home | help
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 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
       Part of the git(1) suite

Git 2.13.2			  06/24/2017		     GIT-MERGE-TREE(1)

NAME | SYNOPSIS | DESCRIPTION | GIT

Want to link to this manual page? Use this URL:
<https://www.freebsd.org/cgi/man.cgi?query=git-merge-tree&sektion=1&manpath=FreeBSD+12.0-RELEASE+and+Ports>

home | help