mirror of
https://github.com/fofolee/uTools-Manuals.git
synced 2025-06-08 15:04:05 +08:00
1 line
1.1 KiB
HTML
1 line
1.1 KiB
HTML
<div class="c-markdown doc-markdown"><div class="doc-postil"><div class="c-markdown"><h2>名称</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>git-merge-tree - 显示不触及索引的三路合并</p></div></div><div class="doc-postil"><div class="c-markdown"><h2>概要</h2></div></div><div class="doc-postil"><div class="c-markdown"><pre class="prism-token token language-javascript">git merge-tree <base-tree> <branch1> <branch2></pre></div></div><div class="doc-postil"><div class="c-markdown"><h2>描述</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>读取三棵树,并将平凡的合并结果和冲突阶段输出到标准输出。这与三路相似<code>git read-tree -m</code>,但不是将结果存储在索引中,而是将输入输出到标准输出。</p></div></div><div class="doc-postil"><div class="c-markdown"><p>这意味着更高级别的脚本将使用它来计算索引之外的合并结果,并将结果重新填充到索引中。因此,该命令的输出省略了匹配<branch1>树的条目。</p></div></div></div> |