git 差分ツールをWinMergeにする

日付

2017-05-26

経緯

Windowsマシンの環境を再構築する時に
まいどまいど設定を忘れるのでメモ。

.gitconfigに設定します

[user]/.gitconfig

以下の内容をコピペ

[user]と[core]は関係ないけどメモなので残しておく。

[user]
    name = XXX
    email = [e-mail]
[core]
    editor = code
    autocrlf = false
[diff]
    guitool = WinMerge
[difftool "WinMerge"]
    path = C:/Program Files/WinMerge/WinMergeU.exe
    cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" -e -u \"$LOCAL\" \"$REMOTE\"
[merge]
    tool = WinMerge
[mergetool "WinMerge"]
    path = C:/Program Files/WinMerge/WinMergeU.exe
    cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" -e -u -dl \"Original\" -dr \"Modified\" \"$MERGED\" \"$REMOTE\"
[mergetool]
    keepBackup = false