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

后端 未结 26 1869
清酒与你
清酒与你 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 03:43

    If you're doing this through cygwin, you may need to use cygpath:

    $ git config difftool.bc3.cmd "git-diff-bcomp-wrapper.sh \$LOCAL \$REMOTE"
    $ cat git-diff-bcomp-wrapper.sh
    #!/bin/sh
    "c:/Program Files (x86)/Beyond Compare 3/BComp.exe" `cygpath -w $1` `cygpath -w $2`
    

提交回复
热议问题