合并/差异工具，可以在版本控制下显示文件中的作者(支持责备或注释) [英] Merge/diff tool that can show authors (supports blame or annotate) in files under version control

问题描述

合并文件时(对我而言)显示每一行的作者将很有帮助.有任何差异或合并工具支持吗?

When merging files it will be helpful (as for me) to show an author of each line. Is there any diff or merge tool supporting that?

推荐答案

捆绑的gitk工具并不是真正的合并工具，但它显示冲突的行，前面有红色和蓝色，并带有"+"号，您可以右键单击->在其中任何一个上显示显示此行的起源"，转到引入该行的提交:

The bundled gitk tool is not really a merge tool, but it shows conflicted lines with red and blue and "+"'s in front, and you can Rightclick->"Show origin of this line" on any of them, to go to the commit which introduced the line:

您可以运行您的mergetool，也可以只运行带有diffmark的文本编辑器

You can run your mergetool, or just a text editor with diffmarks in parallel

这篇关于合并/差异工具，可以在版本控制下显示文件中的作者(支持责备或注释)的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！