Using meld as difftool for git but listing all files in one window

假装没事ソ 提交于 2019-12-03 07:39:17

I fixed my problem by removing meld and use a new version (3.12.3) of it:
sudo apt-get remove meld

Now my .gitconfig is like :

[difftool]
    prompt = false

[diff]
    tool = meld
    guitool = meld

[difftool "meld"]
    path = /home/me/App/meld/meld-3.12.3/bin/meld

And the result from the folowing commands are :

  • git diff : terminal diff of each modified files
  • git diff <myfile> : terminal diff of <myfile>
  • git difftool <myfile> : meld diff of <myfile>
  • git difftool : meld diff of each modified files, one bye one
  • git difftool -d : meld diff of each file, into a single window

I 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'

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!