本文介绍了使用meld作为difftool for git,但在一个窗口中列出所有文件的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧! 问题描述 29岁程序员,3月因学历无情被辞! 如果我将 .gitconfig 配置为像 [difftool] prompt = false [diff] tool = meld 并运行命令: $ git difftool 然后git打开每个有变化的文件的meld窗口。 但是我想要一个单独的窗口,所有的文件都在meld列表框中。 我读了一些关于 -d 或 - dir-diff 选项的信息。 当我尝试: $ git difftool -d 时,在每个meld部分打开一个目录树,但要么包含空目录。 我无法从这里打开我的文件。 $ git --version git版本1.9.1 $ meld --version meld 1.8.4 $ lsb_release -d 说明:Ubuntu 14.04.2 LTS 我使用 git svn ,但我不认为这与我的问题有关;因为据我了解git-svn,我的目录是一个简单的git目录。 相关问题: >解决方案我通过删除meld并使用它的新版本(3.12.3)来解决我的问题: sudo apt-get remove meld 现在我的 .gitconfig 就像: [difftool] 提示符= false [diff] 工具=合并 guitool = meld [difftoolmeld] path = /home/me/App/meld/meld-3.12.3/bin/meld 以下命令的结果是: git diff :每个修改过的文件的终端diff git diff :< myfile> git difftool< myfile> :< myfile> 的美元差异 git difftool :每个修改文件的meld diff,一个再见一个 git difftool -d :每个文件的meld diff,放到一个窗口中 我也将这行添加到我的 bash_alias ,但我认为它可以不用。 alias meld ='/ home / benjamin / Applications / meld / meld-3.12.3 / bin / meld' I want to use meld as my diff tool for git.If I configure my .gitconfig like this :[difftool] prompt = false[diff] tool = meldand run command : $ git difftoolthen git open a meld window for each file which have changes.But I want one single window with all my files in the meld list box.I have read a little about -d or --dir-diff option.When I try : $ git difftool -dthen a single windows is opened with one directory tree in each meld part, but either contain empty directories.I can not open my files from here.For infomation :$ git --versiongit version 1.9.1$ meld --versionmeld 1.8.4$ lsb_release -dDescription: Ubuntu 14.04.2 LTSI am using git svn too, but I don't think this is related in my problem; because as far as I understand git-svn, my directory work as a simple git directory.Related questions :View differences of branches with meld? 解决方案 I fixed my problem by removing meld and use a new version (3.12.3) of it:sudo apt-get remove meldNow my .gitconfig is like : [difftool] prompt = false[diff] tool = meld guitool = meld[difftool "meld"] path = /home/me/App/meld/meld-3.12.3/bin/meldAnd the result from the folowing commands are :git diff : terminal diff of each modified filesgit diff <myfile> : terminal diff of <myfile>git difftool <myfile> : meld diff of <myfile>git difftool : meld diff of each modified files, one bye onegit difftool -d : meld diff of each file, into a single windowI have also add this line to my bash_alias but I think it could work without.alias meld='/home/benjamin/Applications/meld/meld-3.12.3/bin/meld' 这篇关于使用meld作为difftool for git,但在一个窗口中列出所有文件的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持! 上岸,阿里云!
09-04 21:01