I have a rather large diff of 2 GIT branches and would like to open them in some sort of nice UI side by side. Something that shows me the diff's easily, and hopefully that I can merge differences one by one. git diff is rather hard to work with.
Go to your repository in Git Bash. Type git config diff. tool winmerge . Verify it worked by typing git difftool .
DESCRIPTION. git difftool is a Git command that allows you to compare and edit files between revisions using common diff tools. git difftool is a frontend to git diff and accepts the same options and arguments. See git-diff[1].
The answer is git difftool (at least for git version 1.6.3 and later). Please remember that it just invokes configured or automatically found graphical diff tool.
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