git命令列 如何配置merge圖形工具？

Question

在命令列下使用git，merge很不方便，怎麼配置圖形工具？

Answer 1

[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 使用起來真的很酷

Answer 2

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