aboutsummaryrefslogtreecommitdiffstats
path: root/git-difftool--helper.sh
AgeCommit message (Expand)AuthorFilesLines
2024-02-20git-difftool--helper: honor `--trust-exit-code` with `--dir-diff`Patrick Steinhardt1-0/+13
2023-04-05mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks1-0/+5
2021-02-09mergetool: break setup_tool out into separate initialization functionSeth House1-0/+6
2019-05-13mergetool: use get_merge_tool functionDenton Liu1-1/+1
2016-08-15difftool: always honor fatal error exit codesJohn Keeping1-0/+7
2016-04-25difftool/mergetool: make the form of yes/no questions consistentNikola Forró1-2/+2
2014-11-21difftool--helper: add explicit exit statementDavid Aguilar1-0/+2
2014-10-28difftool: add support for --trust-exit-codeDavid Aguilar1-0/+6
2014-10-27difftool--helper: exit when reading a prompt answer failsJohannes Sixt1-1/+2
2013-12-06difftool: display the number of files in the diff queue in the promptZoltan Klinger1-1/+2
2013-02-10difftool--helper: fix printf usageDavid Aguilar1-1/+1
2012-04-23difftool: teach difftool to handle directory diffsTim Henigan1-6/+13
2011-10-10git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty1-3/+6
2011-08-19difftool--helper: Make style consistent with gitDavid Aguilar1-6/+12
2010-12-16difftool: provide basename to external toolsMichael J Gruber1-0/+1
2010-01-22Make difftool.prompt fall back to mergetool.promptSebastian Schuberth1-1/+2
2010-01-15difftool: Update copyright notices to list each year separatelyDavid Aguilar1-1/+1
2010-01-15difftool: Use eval to expand '--extcmd' expressionsDavid Aguilar1-2/+1
2010-01-09difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar1-7/+23
2010-01-09difftool--helper: Remove use of the GIT_MERGE_TOOL variableDavid Aguilar1-5/+4
2010-01-09difftool--helper: Update copyright and remove distracting commentsDavid Aguilar1-4/+1
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar1-3/+3
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar1-177/+9
2009-04-07difftool: add support for a difftool.prompt config variableDavid Aguilar1-2/+8
2009-04-07difftool: move 'git-difftool' out of contribDavid Aguilar1-0/+221
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 14:59:14 +0000