1. 42943b9 mergetool: new config guiDefault supports auto-toggling gui by DISPLAY by Tao Klerks · 1 year, 10 months ago
  2. de8dafb mergetool: break setup_tool out into separate initialization function by Seth House · 4 years ago
  3. 05fb872 mergetool: use get_merge_tool function by Denton Liu · 6 years ago
  4. 45a4f5d difftool: always honor fatal error exit codes by John Keeping · 8 years ago
  5. cce076e difftool/mergetool: make the form of yes/no questions consistent by Nikola Forró · 9 years ago
  6. c41d3fe difftool--helper: add explicit exit statement by David Aguilar · 10 years ago
  7. 2b52123 difftool: add support for --trust-exit-code by David Aguilar · 10 years ago
  8. 2509869 difftool--helper: exit when reading a prompt answer fails by Johannes Sixt · 10 years ago
  9. ee7fb0b difftool: display the number of files in the diff queue in the prompt by Zoltan Klinger · 11 years ago
  10. 2a9ccff difftool--helper: fix printf usage by David Aguilar · 12 years ago
  11. 7e0abce difftool: teach difftool to handle directory diffs by Tim Henigan · 13 years ago
  12. ba959de git-difftool: allow skipping file by typing 'n' at prompt by Sitaram Chamarty · 13 years ago
  13. fdd7aa1 difftool--helper: Make style consistent with git by David Aguilar · 13 years ago
  14. 4a689af difftool: provide basename to external tools by Michael J Gruber · 14 years ago
  15. 4cacc62 Make difftool.prompt fall back to mergetool.prompt by Sebastian Schuberth · 15 years ago
  16. c8a5672 difftool: Update copyright notices to list each year separately by David Aguilar · 15 years ago
  17. 9f3d54d difftool: Use eval to expand '--extcmd' expressions by David Aguilar · 15 years ago
  18. 1c6f5b5 difftool: Allow specifying unconfigured commands with --extcmd by David Aguilar · 15 years ago
  19. 61ed71d difftool--helper: Remove use of the GIT_MERGE_TOOL variable by David Aguilar · 15 years ago
  20. db36713 difftool--helper: Update copyright and remove distracting comments by David Aguilar · 15 years ago
  21. 47d6592 mergetool--lib: simplify API usage by removing more global variables by David Aguilar · 16 years ago
  22. 21d0ba7 difftool/mergetool: refactor commands to use git-mergetool--lib by David Aguilar · 16 years ago
  23. a904392 difftool: add support for a difftool.prompt config variable by David Aguilar · 16 years ago
  24. afcbc8e difftool: move 'git-difftool' out of contrib by David Aguilar · 16 years ago