summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
AgeCommit message (Expand)Author
2015-05-20mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar
2014-11-21mergetool: simplify conditionalsDavid Aguilar
2014-10-21Merge branch 'da/mergetool-temporary-directory'Junio C Hamano
2014-10-21Merge branch 'da/mergetool-tool-help'Junio C Hamano
2014-10-21Merge branch 'da/mergetool-temporary-filename'Junio C Hamano
2014-10-16mergetool: add an option for writing to a temporary directoryDavid Aguilar
2014-10-16mergetool: use more conservative temporary filenamesDavid Aguilar
2014-10-15difftool: don't assume that default sh is saneCharles Bailey
2014-10-15mergetool: don't require a work tree for --tool-helpCharles Bailey
2014-10-15mergetool: use more conservative temporary filenamesDavid Aguilar
2014-06-09git-mergetool.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto
2014-04-22mergetool: run prompt only if guessed toolFelipe Contreras
2013-02-14Merge branch 'al/mergetool-printf-fix'Junio C Hamano
2013-02-08git-mergetool: print filename when it contains %Asheesh Laroia
2013-01-25git-mergetool: move show_tool_help to mergetool--libJohn Keeping
2012-08-24mergetool: style fixesJunio C Hamano
2012-07-23mergetool: support --tool-help option like difftool doesJunio C Hamano
2012-01-23mergetool: Provide an empty file when neededDavid Aguilar
2011-10-10Merge branch 'jm/mergetool-pathspec'Junio C Hamano
2011-09-26mergetool: no longer need to save standard inputJunio C Hamano
2011-09-26mergetool: Use args as pathspec to unmerged filesJonathon Mah
2011-09-20git-mergetool: check return value from readJay Soffian
2011-07-01mergetool: check return value from readJunio C Hamano
2011-04-13mergetool: Teach about submodulesJonathon Mah
2011-02-16mergetool: don't skip modify/remove conflictsMartin von Zweigbergk
2010-09-03Merge branch 'cb/maint-mergetool-no-tty'Junio C Hamano
2010-08-20mergetool: Remove explicit references to /dev/ttyCharles Bailey
2010-08-17mergetool: Skip autoresolved pathsDavid Aguilar
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar
2009-04-11Fix misspelled mergetool.keepBackupFerry Huberts
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar
2009-04-08mergetool: use $( ... ) instead of `backticks`David Aguilar
2009-04-08difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping
2009-04-08git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg
2009-04-08git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg
2009-02-06Merge branch 'cb/mergetool'Junio C Hamano
2009-01-31mergetool: fix running mergetool in sub-directoriesCharles Bailey
2009-01-27mergetool: respect autocrlf by using checkout-indexCharles Bailey
2009-01-27mergetool: Don't repeat merge tool candidatesJohannes Gilger
2009-01-18mergetool: put the cursor on the editable file for VimMarkus Heidelberg
2009-01-01Merge branch 'cb/mergetool'Junio C Hamano
2008-12-20git-mergetool: properly handle "git mergetool -- filename"David Aguilar
2008-12-13mergetool: Don't keep temporary merge files unless told toCharles Bailey
2008-12-13mergetool: Add prompt to continue after failing to merge a fileCharles Bailey
2008-11-15Add -y/--no-prompt option to mergetoolCharles Bailey
2008-11-15Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey
2008-06-19Remove the use of '--' in merge program invocationPatrick Higgins
2008-05-11mergetool: Make ECMerge use the settings as specified by the user in the GUISebastian Schuberth
2008-03-05Teach git mergetool to use custom commands defined at config timeCharles Bailey
2008-03-05Changed an internal variable of mergetool to support custom commandsCharles Bailey