summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
Commit message (Expand)AuthorAgeFilesLines
* mergetool: break setup_tool out into separate initialization functionSeth House2021-02-091-0/+6
* mergetool: use get_merge_tool functionDenton Liu2019-05-131-1/+1
* difftool: always honor fatal error exit codesjk/difftool-command-not-foundJohn Keeping2016-08-151-0/+7
* difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-promptNikola Forró2016-04-251-2/+2
* difftool--helper: add explicit exit statementDavid Aguilar2014-11-211-0/+2
* difftool: add support for --trust-exit-codeDavid Aguilar2014-10-281-0/+6
* difftool--helper: exit when reading a prompt answer failsJohannes Sixt2014-10-271-1/+2
* difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-061-1/+2
* difftool--helper: fix printf usageDavid Aguilar2013-02-101-1/+1
* difftool: teach difftool to handle directory diffsTim Henigan2012-04-231-6/+13
* git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty2011-10-101-3/+6
* difftool--helper: Make style consistent with gitDavid Aguilar2011-08-191-6/+12
* difftool: provide basename to external toolsMichael J Gruber2010-12-161-0/+1
* Make difftool.prompt fall back to mergetool.promptSebastian Schuberth2010-01-221-1/+2
* difftool: Update copyright notices to list each year separatelyDavid Aguilar2010-01-151-1/+1
* difftool: Use eval to expand '--extcmd' expressionsDavid Aguilar2010-01-151-2/+1
* difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-091-7/+23
* difftool--helper: Remove use of the GIT_MERGE_TOOL variableDavid Aguilar2010-01-091-5/+4
* difftool--helper: Update copyright and remove distracting commentsDavid Aguilar2010-01-091-4/+1
* mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-121-3/+3
* difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-081-177/+9
* difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-071-2/+8
* difftool: move 'git-difftool' out of contribDavid Aguilar2009-04-071-0/+221
View Lorry Controller Status