How do I view 'git diff' output with my preferred diff tool/ viewer?

后端 未结 26 1864
清酒与你
清酒与你 2020-11-22 03:20

When I type git diff, I want to view the output with my visual diff tool of choice (SourceGear \"diffmerge\" on Windows). How do I configure git to do this?

26条回答
  •  清酒与你
    2020-11-22 04:09

    this works for me on windows 7. No need for intermediary sh scripts

    contents of .gitconfig:

        [diff]
          tool = kdiff3
    
        [difftool]
           prompt = false
    
        [difftool "kdiff3"]
          path = C:/Program Files (x86)/KDiff3/kdiff3.exe
          cmd = "$LOCAL" "$REMOTE"
    

提交回复
热议问题