IgniteWhite
2023-10-11 20:02:39 +08:00
git difftool --tool-help
输出结果里的都可以参考，比如我这里是
'git difftool --tool=<tool>' may be set to one of the following:
araxis Use Araxis Merge (requires a graphical session)
emerge Use Emacs' Emerge
gvimdiff Use gVim (requires a graphical session)
nvimdiff Use Neovim
opendiff Use FileMerge (requires a graphical session)
vimdiff Use Vim
The following tools are valid, but not currently available:
bc Use Beyond Compare (requires a graphical session)
bc3 Use Beyond Compare (requires a graphical session)
bc4 Use Beyond Compare (requires a graphical session)
codecompare Use Code Compare (requires a graphical session)
deltawalker Use DeltaWalker (requires a graphical session)
diffmerge Use DiffMerge (requires a graphical session)
diffuse Use Diffuse (requires a graphical session)
ecmerge Use ECMerge (requires a graphical session)
examdiff Use ExamDiff Pro (requires a graphical session)
guiffy Use Guiffy's Diff Tool (requires a graphical session)
kdiff3 Use KDiff3 (requires a graphical session)
kompare Use Kompare (requires a graphical session)
meld Use Meld (requires a graphical session)
p4merge Use HelixCore P4Merge (requires a graphical session)
smerge Use Sublime Merge (requires a graphical session)
tkdiff Use TkDiff (requires a graphical session)
winmerge Use WinMerge (requires a graphical session)
xxdiff Use xxdiff (requires a graphical session)
Some of the tools listed above only work in a windowed
environment. If run in a terminal-only session, they will fail.