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

前端 未结 1 648
渐次进展
渐次进展 2021-02-09 19:43

I want to use meld as my diff tool for git.

If I configure my .gitconfig like this :

[difftool]
    prompt = false
[diff]
    tool = meld


        
相关标签:
1条回答
  • 2021-02-09 20:37

    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'

    0 讨论(0)
提交回复
热议问题