开发者

git-difftool: full file tree compare using meld?

开发者 https://www.devze.com 2022-12-23 17:38 出处:网络
Is there an easy way to compare the file tree of an old git commit with 开发者_C百科the working file tree, in meld?

Is there an easy way to compare the file tree of an old git commit with 开发者_C百科the working file tree, in meld?

git-difftool does something very similar, but I don't want it to actually do any diffing; the whole point is that the tool it is calling can provide a better interface for that.


With git > 1.7.11, the git difftool command now supports diffing complete directories using the --dir-diff command. This can be used together with meld:

$ git difftool --tool=meld --dir-diff [commit-to-diff-against]


I've tested this on a recent version of meld and it is now built in. You can use it with meld <directory path> so "meld ." works for the current directory. You can checkout a version git co [version] then git reset [version]^ and then run "meld ." to compare any version with it's previous version.


I also found this issue annoying so I've made git meld which allows a more comfortable way of diffing arbitrary commits against the working tree or the staging area. You can find it at https://github.com/wmanley/git-meld .

0

精彩评论

暂无评论...
验证码 换一张
取 消