study/uTools-Manuals
1
0
Fork 0
mirror of https://github.com/fofolee/uTools-Manuals.git synced 2026-02-26 17:11:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

git语法高亮

Browse Source
This commit is contained in:
fofolee
2019-05-07 10:40:55 +08:00
parent 6ae6134047
commit 409f6fc5c1
160 changed files with 605 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/git/git merge-tree.html
View File

@@ -1 +1 @@
<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 &lt;base-tree&gt; &lt;branch1&gt; &lt;branch2&gt;</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>这意味着更高级别的脚本将使用它来计算索引之外的合并结果，并将结果重新填充到索引中。因此，该命令的输出省略了匹配&lt;branch1&gt;树的条目。</p></div></div></div>
<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><code class="language-Bash">git merge-tree &lt;base-tree&gt; &lt;branch1&gt; &lt;branch2&gt;</code></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>这意味着更高级别的脚本将使用它来计算索引之外的合并结果，并将结果重新填充到索引中。因此，该命令的输出省略了匹配&lt;branch1&gt;树的条目。</p></div></div></div>