"Fossies" - the Fresh Open Source Software Archive

Member "git-merge-tree.txt" (15 Dec 2018, 750 Bytes) of package /linux/misc/git-htmldocs-2.20.1.tar.xz:


As a special service "Fossies" has tried to format the requested text file into HTML format (style: standard) with prefixed line numbers. Alternatively you can here view or download the uninterpreted source code file.

    1 git-merge-tree(1)
    2 =================
    3 
    4 NAME
    5 ----
    6 git-merge-tree - Show three-way merge without touching index
    7 
    8 
    9 SYNOPSIS
   10 --------
   11 [verse]
   12 'git merge-tree' <base-tree> <branch1> <branch2>
   13 
   14 DESCRIPTION
   15 -----------
   16 Reads three tree-ish, and output trivial merge results and
   17 conflicting stages to the standard output.  This is similar to
   18 what three-way 'git read-tree -m' does, but instead of storing the
   19 results in the index, the command outputs the entries to the
   20 standard output.
   21 
   22 This is meant to be used by higher level scripts to compute
   23 merge results outside of the index, and stuff the results back into the
   24 index.  For this reason, the output from the command omits
   25 entries that match the <branch1> tree.
   26 
   27 GIT
   28 ---
   29 Part of the linkgit:git[1] suite