Menu
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?
542
The high-level function of git blame is the display of author metadata attached to specific committed lines in a file. This is used to examine specific points of a file's history and get context as to who the last author was that modified the line.
So whenever diff shows you the changes related to the first file, they will be marked by - and the changes in the second file will be marked by the symbol +. This means that lines one and two were changed in the first file and line one was changed in the second file.
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:
You can run your mergetool, or just a text editor with diffmarks in parallel
180
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
