uTools-Manuals/docs/git/git merge-one-file.html
2019-05-07 10:40:55 +08:00

1 line
750 B
HTML
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

<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-one-file  - 与 git-merge-index 一起使用的标准帮助程序</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-one-file</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 merge-index</code>用来解决一个合并后,琐碎的合并完成<code>git read-tree -m</code></p></div></div></div>