I have configured kDiff3 with my git.
What I need is to see directory difference between two branches. when I run
git difftool <headbranch>
command it opens all files one by one. But that is not I want.
Type git config diff. tool winmerge . Verify it worked by typing git difftool . Get rid of the prompt typing git config --global difftool.
Let's say, we have the two branches master and base In order to see the difference between these branches, just execute:
git difftool -d base:src/ master:src/
Then your preset diff tool should get started, in my case kdiff3.
Or you can also use the --tool
option to start another one:
e.g. with vimdiff
git difftool -d --tool=vimdiff base:src/ master:src/
or with kdiff3 the same way
git difftool -d --tool=kdiff3 base:src/ master:src/
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