提交 3021faf6 编写于 作者: S Sitaram Chamarty 提交者: Junio C Hamano

Documentation: clarify commits affected by gitk --merge

Signed-off-by: NSitaram Chamarty <sitaramc@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 9aad6cba
......@@ -47,7 +47,8 @@ frequently used options.
After an attempt to merge stops with conflicts, show the commits on
the history between two branches (i.e. the HEAD and the MERGE_HEAD)
that modify the conflicted files.
that modify the conflicted files and do not exist on all the heads
being merged.
--argscmd=<command>::
Command to be run each time gitk has to determine the list of
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册