path: root/
AgeCommit message (Expand)Author
2021-02-09mergetool: break setup_tool out into separate initialization functionSeth House
2019-05-13mergetool: use get_merge_tool functionDenton Liu
2016-08-15difftool: always honor fatal error exit codesJohn Keeping
2016-04-25difftool/mergetool: make the form of yes/no questions consistentNikola Forró
2014-11-21difftool--helper: add explicit exit statementDavid Aguilar
2014-10-28difftool: add support for --trust-exit-codeDavid Aguilar
2014-10-27difftool--helper: exit when reading a prompt answer failsJohannes Sixt
2013-12-06difftool: display the number of files in the diff queue in the promptZoltan Klinger
2013-02-10difftool--helper: fix printf usageDavid Aguilar
2012-04-23difftool: teach difftool to handle directory diffsTim Henigan
2011-10-10git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty
2011-08-19difftool--helper: Make style consistent with gitDavid Aguilar
2010-12-16difftool: provide basename to external toolsMichael J Gruber
2010-01-22Make difftool.prompt fall back to mergetool.promptSebastian Schuberth
2010-01-16difftool: Update copyright notices to list each year separatelyDavid Aguilar
2010-01-15difftool: Use eval to expand '--extcmd' expressionsDavid Aguilar
2010-01-10difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar
2010-01-10difftool--helper: Remove use of the GIT_MERGE_TOOL variableDavid Aguilar
2010-01-10difftool--helper: Update copyright and remove distracting commentsDavid Aguilar
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar
2009-04-08difftool: add support for a difftool.prompt config variableDavid Aguilar
2009-04-08difftool: move 'git-difftool' out of contribDavid Aguilar