GIT MERGE DIFF TOOL

设置prompt backup

1. git config --global difftool.prompt false
2. git config --global mergetool.prompt false
3. git config --global mergetool.keepBackup false

tortoise

通过命令行设置git merge tool tortoisemerge

git config --global merge.tool tortoisemerge
git config --global mergetool.tortoisemerge.path "C:\Program Files\TortoiseGit\bin\TortoiseGitMerge.exe" #可不设置

通过命令行设置git difftool

TortoiseGitMerge BaseFilePath MyFilePath [ TheirFilePath ]

git config --global diff.tool tortoisediff
git config --global difftool.tortoisediff.cmd "TortoiseGitMerge \$LOCAL \$REMOTE"
git config --global difftool.tortoisediff.path "C:\Program Files\TortoiseGit\bin\TortoiseGitMerge.exe" #可不设置

bc

git config --global diff.tool bc
git config --global merge.tool bc
git config --global difftool.bc.path "C:\Program Files\Beyond Compare 4\BComp.exe"
git config --global mergetool.bc.path "C:\Program Files\Beyond Compare 4\BComp.exe"

DiffMerge

git config --global diff.tool diffmerge
git config --global difftool.diffmerge.path 'C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe'
git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.path 'C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe'

sourcetree

[difftool "sourcetree"]
    cmd = 'C:/Program Files/Beyond Compare 4/BCompare.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
    cmd = 'C:/Program Files/Beyond Compare 4/BCompare.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" -o \"$MERGED\"
    trustExitCode = true