Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

git client which can do a directory diff

I know that the latest git can use this command to directory diff two versions:

git difftool -d <sha1> <sha1>

But I can't find any git clients(GUI) which can do this job.

I've tried tortoisegit smartgit git-cola git-extentions github gitk

None of them has this feature, could anyone recommend any git client(runs on windows xp) which can do this?

I don't know if sourcetree can do this or not, cause I don't have either win7 or mac.

Thanks.

like image 384
shengy Avatar asked Dec 19 '25 20:12

shengy


2 Answers

The standard windows git client, msysgit, can do this if you configure it to use Beyond Compare 3 (not free) as diff tool.

You can set it up like this:

git config --global diff.tool bc3
git config --global difftool.bc3.cmd "\"c:/Program Files/Beyond Compare 3/BCompare.exe\" \"$LOCAL\" \"$REMOTE\""
git config --global difftool.prompt false

Edit: Actually kdiff3 does this too, and is free. Setup here:

[diff]
    tool = kdiff3

[merge]
    tool = kdiff3

[mergetool "kdiff3"]
    path = C:/YourPathToBinaryHere/KDiff3/kdiff3.exe
    keepBackup = false
    trustExitCode = false

[difftool "kdiff3"]
    path = C:/YourPathToBinaryHere/KDiff3/kdiff3.exe
    keepBackup = false
    trustExitCode = false
like image 126
Klas Mellbourn Avatar answered Dec 21 '25 11:12

Klas Mellbourn


in tortoise git:

  • open "git log"
  • mark two commits
  • rightclick
  • compare these revisions
like image 44
wutzebaer Avatar answered Dec 21 '25 13:12

wutzebaer



Donate For Us

If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!