Commit Graph

23 Commits (master)

Author SHA1 Message Date
Seth House de8dafbada mergetool: break setup_tool out into separate initialization function 2 years ago
Denton Liu 05fb8726cc mergetool: use get_merge_tool function 3 years ago
John Keeping 45a4f5d9f9 difftool: always honor fatal error exit codes 6 years ago
Nikola Forró cce076e371 difftool/mergetool: make the form of yes/no questions consistent 7 years ago
David Aguilar c41d3fedd8 difftool--helper: add explicit exit statement 8 years ago
David Aguilar 2b52123fcf difftool: add support for --trust-exit-code 8 years ago
Johannes Sixt 25098690a0 difftool--helper: exit when reading a prompt answer fails 8 years ago
Zoltan Klinger ee7fb0b1d4 difftool: display the number of files in the diff queue in the prompt 9 years ago
David Aguilar 2a9ccfff55 difftool--helper: fix printf usage 10 years ago
Tim Henigan 7e0abcec10 difftool: teach difftool to handle directory diffs 11 years ago
Sitaram Chamarty ba959de165 git-difftool: allow skipping file by typing 'n' at prompt 11 years ago
David Aguilar fdd7aa17f8 difftool--helper: Make style consistent with git 11 years ago
Michael J Gruber 4a689afb03 difftool: provide basename to external tools 12 years ago
Sebastian Schuberth 4cacc621f8 Make difftool.prompt fall back to mergetool.prompt 13 years ago
David Aguilar c8a5672ea5 difftool: Update copyright notices to list each year separately 13 years ago
David Aguilar 9f3d54d193 difftool: Use eval to expand '--extcmd' expressions 13 years ago
David Aguilar 1c6f5b52b7 difftool: Allow specifying unconfigured commands with --extcmd 13 years ago
David Aguilar 61ed71dcff difftool--helper: Remove use of the GIT_MERGE_TOOL variable 13 years ago
David Aguilar db36713660 difftool--helper: Update copyright and remove distracting comments 13 years ago
David Aguilar 47d65924a6 mergetool--lib: simplify API usage by removing more global variables 14 years ago
David Aguilar 21d0ba7ebb difftool/mergetool: refactor commands to use git-mergetool--lib 14 years ago
David Aguilar a904392eae difftool: add support for a difftool.prompt config variable 14 years ago
David Aguilar afcbc8e7ec difftool: move 'git-difftool' out of contrib 14 years ago
Sebastian Pipping 1c0f3d224e difftool/mergetool: add diffuse as merge and diff tool 14 years ago
David Aguilar 2e8af7e42b difftool: remove the backup file feature 14 years ago
David Aguilar 76ca653842 difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff 14 years ago
Markus Heidelberg bad4273200 git-mergetool/difftool: make (g)vimdiff workable under Windows 14 years ago
David Aguilar 2464456a6a contrib/difftool: use a separate config namespace for difftool commands 14 years ago
David Aguilar 99ccabaffa contrib/difftool: Don't repeat merge tool candidates 14 years ago
Markus Heidelberg 384770a5e7 contrib/difftool: add support for Kompare 14 years ago
Markus Heidelberg bc08fc4e85 contrib/difftool: remove distracting 'echo' in the SIGINT handler 14 years ago
Markus Heidelberg f13bfc1be7 contrib/difftool: change trap condition from SIGINT to INT 14 years ago
David Aguilar 28da86a58d difftool: put the cursor on the editable file for Vim 14 years ago
David Aguilar 5c38ea31f3 contrib: add 'git difftool' for launching common merge tools 14 years ago