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"

It’s really fun to use the command line with tortoisemerge

Answer 2

As long as the system has image operation, there are a lot of GUI Git clients, which can operate Git very conveniently. I recommend one of them: SourceTree, which is full-featured and cross-platform.
https://www.sourcetreeapp.com/