[diff]
  tool = tortoisediff
[difftool]
  prompt = false
[merge]
  tool = tortoisemerge
[mergetool]
  prompt = false
  keepBackup = false

[difftool "tortoisediff"]
cmd = "TortoiseMerge.exe" -mine:"$REMOTE" -base:"$LOCAL"

[mergetool "tortoisemerge"]
cmd = "TortoiseMerge.exe" -base:"$BASE" -theirs:"$REMOTE" -mine:"$LOCAL" -merged:"$MERGED"

命令行配合tortoisemerge 使用起来真的很爽

只要是有图像操作的系统，都有一大堆GUI的Git客户端，可以非常方便的操作Git，推荐其中一个：SourceTree ，功能全，跨平台。
https://www.sourcetreeapp.com/