Advertisement
Guest User

git difftool --tool-help

a guest
Nov 4th, 2021
412
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.55 KB | None | 0 0
  1. $ git difftool --tool-help
  2. 'git difftool --tool=<tool>' may be set to one of the following:
  3. araxis
  4. meld
  5. vimdiff
  6. Opens vim with two vertical windows: LOCAL changes will be placed in the left
  7. window and REMOTE changes in the right one.
  8. vimdiff1
  9. Same as 'vimdiff'
  10. vimdiff2
  11. Same as 'vimdiff'
  12. vimdiff3
  13. Same as 'vimdiff'
  14.  
  15. user-defined:
  16. default-difftool.cmd vim -f '+next' '+execute "DirDiff" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
  17. vimdiff4.cmd vim -f -d -c "4wincmd w | wincmd J | tabnew | edit $LOCAL | vertical diffsplit $BASE | tabnew | edit $REMOTE | vertical diffsplit $BASE | 2tabprevious" "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
  18.  
  19. The following tools are valid, but not currently available:
  20. bc
  21. bc3
  22. bc4
  23. codecompare
  24. deltawalker
  25. diffmerge
  26. diffuse
  27. ecmerge
  28. emerge
  29. examdiff
  30. guiffy
  31. gvimdiff
  32. Same as 'vimdiff' but opens 'gvim' instead (which uses a graphical toolkit for
  33. opening its own window)
  34. gvimdiff1
  35. Same as 'gvimdiff'
  36. gvimdiff2
  37. Same as 'gvimdiff'
  38. gvimdiff3
  39. Same as 'gvimdiff'
  40. kdiff3
  41. kompare
  42. nvimdiff
  43. Same as 'vimdiff' but opens 'neovim' instead (which is a fork of the original
  44. 'vim' 'focused on extensibility and usability' according to their authors)
  45. nvimdiff1
  46. Same as 'nvimdiff'
  47. nvimdiff2
  48. Same as 'nvimdiff'
  49. nvimdiff3
  50. Same as 'nvimdiff'
  51. opendiff
  52. p4merge
  53. smerge
  54. tkdiff
  55. winmerge
  56. xxdiff
  57.  
  58. Some of the tools listed above only work in a windowed
  59. environment. If run in a terminal-only session, they will fail.
  60.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement