path: root/
AgeCommit message (Expand)Author
2021-03-13mergetool: do not enable hideResolved by defaultJonathan Nieder
2021-02-09mergetool: add per-tool support and overrides for the hideResolved flagSeth House
2021-02-09mergetool: break setup_tool out into separate initialization functionSeth House
2021-02-09mergetool: add hideResolved configurationSeth House
2019-06-12mergetool: use shell variable magic instead of `awk`Johannes Sixt
2019-06-12mergetool: dissect strings with shell variable magic instead of `expr`Johannes Sixt
2019-05-13mergetool: use get_merge_tool functionDenton Liu
2018-10-25mergetool: accept -g/--[no-]gui as argumentsDenton Liu
2018-08-13mergetool: don't suggest to continue after last fileNicholas Guriev
2017-01-10mergetool: fix running in subdir when rerere enabledRichard Hansen
2017-01-10mergetool: take the "-O" out of $orderfileRichard Hansen
2016-10-11mergetool: honor -O<orderfile>David Aguilar
2016-10-11mergetool: honor diff.orderFileDavid Aguilar
2016-10-11mergetool: move main program flow into a main() functionDavid Aguilar
2016-10-11mergetool: add copyrightDavid Aguilar
2016-05-03Merge branch 'nf/mergetool-prompt'Junio C Hamano
2016-04-25difftool/mergetool: make the form of yes/no questions consistentNikola Forró
2016-03-10mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar
2016-03-10mergetool: support delete/delete conflictsDavid Aguilar
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 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