我喜欢在cygwin上使用git，但唯一的缺点是当我想要git difftool我不能使用任何有用的东西。 git diff在大多数情况下都适用，但有时我想用winmerge通过git difftool来查看这些差异是否有一些方法来设置它？
对于cygwin，SO问题“ 如何配置Mercurial使用WinMerge进行合并，在cygwin下？ ”可以应用于git（当将以下winmerge脚本与旧的问题结合使用时，请使用 “ 将Git中的Winmerge用于文件差异 ”）
#!/bin/sh "/cygdrive/c/Program Files/WinMerge/WinMergeU.EXE" /e /ub /dl other /dr local `cygpath -aw $1` `cygpath -aw $2` `cygpath -aw $3`
在本文“ Git + WinMerge + Cygwin ”（来自Thiru Thirunavukarasu ）中有更多的细节：
（但我仍然会推荐从上面的WinMergeU.exe选项）
将下列行添加到.gitconfig文件中：
[diff] tool = winmerge [difftool "winmerge"] cmd = git-difftool-winmerge-wrapper.sh \"$LOCAL\" \"$REMOTE\" [difftool] prompt = false
最后一个选项（
prompt = false）是可选的。 如果你希望在打开每个diff之前让Git提示你，你可以忽略它。创建一个名为
git-difftool-winmerge-wrapper.sh的文件并将其放在你的路径中。
我只是把它放在我的主目录中。 您可以通过修改.bash_profile文件（也在您的主目录中）并添加PATH=${PATH}:${HOME}来更改默认的Cygwin路径以包含您的主目录PATH=${PATH}:${HOME}将以下内容添加到
git-difftool-winmerge-wrapper.sh：
#!/bin/sh echo "Launching WinMergeU.exe \"$(cygpath -aw "$1")\" \"$(cygpath -aw "$2")\"" if [ -f "$1" -a -f "$2" ] then "C:/Program Files (x86)/WinMerge/WinMergeU.exe" -e -u -wl -dl "Base" -dr "Mine" "$(cygpath -aw "$1")" "$(cygpath -aw "$2")" else echo "skipping as one file doesn't exist" fi
（再次，使用WinMerge选项进行一些测试）
如果你想去“所有的WinMerge”，无论是比较和合并git函数，你有ecerulm（鲁本拉古纳） 遵循这个要点 ：
diffmerge-diff.sh
#!/bin/sh # Use SourceGear DiffMerge as mergetool for git in cygwin. # git config --global mergetool.diffmerge.cmd "diffmergetool.sh \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\" \"\$MERGED\"" # git config --global mergetool.diffmerge.trustExitCode false # git difftool -t diffmerge branch1..branch2 # Reference: http://www.tldp.org/LDP/abs/abs-guide.pdf library=githelperfunctions.sh #[ -f $library ] && . $library . $library echo Launching DiffMerge.exe - diffmerge-diff.sh: set_path_vars "$1" "$2" "$3" "$4" echo "$diffmergewinpath" -t1=FROM_VERSION -t2=TO_VERSION --caption=$caption $localwinpath $remotewinpath "$diffmergewinpath" -t1=FROM_VERSION -t2=TO_VERSION --caption="$caption" "$localwinpath" "$remotewinpath"
diffmerge-merge.sh
#!/bin/sh # Use SourceGear DiffMerge as mergetool for git in cygwin. # git config --global mergetool.diffmerge.cmd "diffmergetool.sh \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\" \"\$MERGED\"" # git config --global mergetool.diffmerge.trustExitCode false # git mergetool -t diffmerge # Reference: http://www.tldp.org/LDP/abs/abs-guide.pdf library=githelperfunctions.sh #[ -f $library ] && . $library . $library echo Launching DiffMerge.exe - diffmerge-merge.sh: set_path_vars "$1" "$2" "$3" "$4" "$diffmergewinpath" --merge -t1=FROM_VERSION -t2=MERGED -t3=TO_VERSION --result="$mergedwinpath" --caption="$caption" "$localwinpath" "$basewinpath" "$remotewinpath" unix2dos "$merged"
githelperfunctions.sh
# Helper functions convert_path () { file=$1 if [ "$file" == '/dev/null' ] || [ ! -e "$file" ] then file="/tmp/nulla" `echo "">$file` fi echo `cygpath -w -a "$file"` } set_path_vars () { local=$1 remote=$2 base=$3 merged=$4 echo ========= Cygwin paths ======= echo "LOCAL : $local" echo "REMOTE : $remote" echo "BASE : $base" echo "MERGED : $merged" localwinpath=$(convert_path "$local") remotewinpath=$(convert_path "$remote") basewinpath=$(convert_path "$base") mergedwinpath=$(convert_path "$merged") echo ========= Win paths ======= echo "LOCAL : $localwinpath" echo "REMOTE : $remotewinpath" echo "BASE : $basewinpath" echo "MERGED : $mergedwinpath" caption=`basename "$merged"` diffmergewinpath="C:/Program Files/SourceGear/DiffMerge/DiffMerge.exe" winmergewinpath="C:/Program Files/WinMerge/WinMergeU.exe" # diffmergewinpath=`cygpath -u C:/Program Files/SourceGear/DiffMerge/DiffMerge.exe` # winmergewinpath=`cygpath -u \"C:\Program Files\WinMerge\WinMergeU.exe\"` }
winmerge-diff.sh
#!/bin/sh # Use winmerge as mergetool for git in cygwin. # git config --global difftool.winmerge.cmd "winmerge-diff.sh \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\"" # git config --global mergetool.winmerge.trustExitCode false # git difftool -t winmerge branch1..branch2 # Reference: http://www.tldp.org/LDP/abs/abs-guide.pdf # Reference: http://winmerge.org/docs/manual/CommandLine.html library=githelperfunctions.sh #[ -f $library ] && . $library . $library echo Launching winmerge.exe - winmerge-diff.sh: set_path_vars "$1" "$2" "$3" "$4" "$winmergewinpath" /dl "LOCAL.$caption" /dr "TO_VERSION.$caption" "$localwinpath" "$remotewinpath"
winmerge-merge.sh
#!/bin/sh # Use winmerge as mergetool for git in cygwin. # git config --global mergetool.winmerge.cmd "winmerge-merge.sh \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\" \"\$MERGED\"" # git config --global mergetool.winmerge.trustExitCode false # git mergetool -t diffmerge # Reference: http://www.tldp.org/LDP/abs/abs-guide.pdf # Reference: http://winmerge.org/docs/manual/CommandLine.html library=githelperfunctions.sh #[ -f $library ] && . $library . $library echo Launching winmerge.exe - winmerge-merge.sh: set_path_vars "$1" "$2" "$3" "$4" # -- use WinMergeU conflictFile "$winmergewinpath" "$mergedwinpath"