uTools-Manuals/docs/git/git fmt-merge-msg.html
2019-04-08 23:22:26 +08:00

3 lines
3.7 KiB
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.

This file contains Unicode characters that might be confused with other characters. 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-fmt-merge-msg  - 产生一个合并提交信息</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 fmt-merge-msg [-m &lt;message&gt;] [--log[=&lt;n&gt;] | --no-log]git fmt-merge-msg [-m &lt;message&gt;] [--log[=&lt;n&gt;] | --no-log] -F &lt;file&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>获取 stdin 上的合并对象列表,并生成合适的提交消息以用于合并提交,通常作为<code>&lt;merge-message&gt;</code>参数传递<code>git merge</code></p></div></div><div class="doc-postil"><div class="c-markdown"><p>该命令主要用于脚本自动调用的内部使用<code>git merge</code></p></div></div><div class="doc-postil"><div class="c-markdown"><h2>选项</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>--log=&lt;n&gt;</p></div></div><div class="doc-postil"><div class="c-markdown"><p>除了分支名称之外,还可以使用来自正在合并的实际提交的单行描述来填充日志消息。至多会使用来自每个合并父项的&lt;n&gt;提交(如果&lt;n&gt;省略则为20。这覆盖<code>merge.log</code>配置变量。</p></div></div><div class="doc-postil"><div class="c-markdown"><p>--no-log</p></div></div><div class="doc-postil"><div class="c-markdown"><p>不要列出正在合并的实际提交中的单行描述。</p></div></div><div class="doc-postil"><div class="c-markdown"><p>--no-summary</p></div></div><div class="doc-postil"><div class="c-markdown"><p>同义词--log和--no-log; 这些已被弃用,并将在未来被删除。</p></div></div><div class="doc-postil"><div class="c-markdown"><p>-m &lt;message&gt;   --message &lt;message&gt;</p></div></div><div class="doc-postil"><div class="c-markdown"><p>使用&lt;message&gt;而不是日志消息第一行的分支名称。用于<code>--log</code></p></div></div><div class="doc-postil"><div class="c-markdown"><p>-F &lt;file&gt;   --file &lt;file&gt;</p></div></div><div class="doc-postil"><div class="c-markdown"><p>&lt;file&gt;获取合并对象的列表,而不是 stdin。</p></div></div><div class="doc-postil"><div class="c-markdown"><h2>组态</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>merge.branchdesc</p></div></div><div class="doc-postil"><div class="c-markdown"><p>除了分支名称之外,还可以使用与它们关联的分支描述文本填充日志消息。默认为
false。</p></div></div><div class="doc-postil"><div class="c-markdown"><p>merge.log</p></div></div><div class="doc-postil"><div class="c-markdown"><p>除了分支名称之外,还可以在日志消息中最多填写指定数量的来自要合并的实际提交的单行描述。默认为 falsetrue 为20的同义词。</p></div></div><div class="doc-postil"><div class="c-markdown"><p>merge.summary</p></div></div><div class="doc-postil"><div class="c-markdown"><p>同义词<code>merge.log</code>; 这已被弃用,并将在未来被删除。</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 fetch origin master
$ git fmt-merge-msg --log &lt;$GIT_DIR/FETCH_HEAD</pre></div></div><div class="doc-postil"><div class="c-markdown"><p>打印描述从“原点”远程合并“主”分支的日志消息。</p></div></div></div>