Query: git-merge-tree
OS: osx
Section: 1
Format: Original Unix Latex Style Formatted with HTML and a Horizontal Scroll Bar
GIT-MERGE-TREE(1) Git Manual GIT-MERGE-TREE(1)NAMEgit-merge-tree - Show three-way merge without touching indexSYNOPSISgit merge-tree <base-tree> <branch1> <branch2>DESCRIPTIONReads 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.GITPart of the git(1) suite Git 2.17.1 10/05/2018 GIT-MERGE-TREE(1)
Related Man Pages |
---|
git-merge-base(1) - linux |
git-merge-base(1) - suse |
git-merge-file(1) - mojave |
git-merge-index(1) - mojave |
git-merge-index(1) - osx |
Similar Topics in the Unix Linux Community |
---|
Mac OS X: Based on UNIX - Solid As a Rock |
When is a _function_ not a _function_? |
Undeletable file |
My first PERL incarnation... Audio Oscillograph |
Syntax error in subtraction in Bash |