summary refs log tree commit diff
path: root/git-mergetool.sh
AgeCommit message (Expand)AuthorFilesLines
2021-03-13mergetool: do not enable hideResolved by defaultJonathan Nieder1-7/+2
2021-02-09mergetool: add per-tool support and overrides for the hideResolved flagSeth House1-1/+35
2021-02-09mergetool: break setup_tool out into separate initialization functionSeth House1-0/+2
2021-02-09mergetool: add hideResolved configurationSeth House1-0/+14
2019-06-12mergetool: use shell variable magic instead of `awk`Johannes Sixt1-5/+20
2019-06-12mergetool: dissect strings with shell variable magic instead of `expr`Johannes Sixt1-9/+11
2019-05-13mergetool: use get_merge_tool functionDenton Liu1-8/+4
2018-10-25mergetool: accept -g/--[no-]gui as argumentsDenton Liu1-2/+9
2018-08-13mergetool: don't suggest to continue after last fileNicholas Guriev1-3/+5
2017-01-10mergetool: fix running in subdir when rerere enabledRichard Hansen1-2/+15
2017-01-10mergetool: take the "-O" out of $orderfileRichard Hansen1-2/+2
2016-10-11mergetool: honor -O<orderfile>David Aguilar1-2/+7
2016-10-11mergetool: honor diff.orderFileDavid Aguilar1-15/+15
2016-10-11mergetool: move main program flow into a main() functionDavid Aguilar1-87/+93
2016-10-11mergetool: add copyrightDavid Aguilar1-0/+1
2016-05-03Merge branch 'nf/mergetool-prompt'Junio C Hamano1-1/+1
2016-04-25difftool/mergetool: make the form of yes/no questions consistentNikola Forró1-1/+1
2016-03-10mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar1-1/+10
2016-03-10mergetool: support delete/delete conflictsDavid Aguilar1-3/+11
2015-05-20mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar1-2/+0
2014-11-21mergetool: simplify conditionalsDavid Aguilar1-11/+5
2014-10-21Merge branch 'da/mergetool-temporary-directory'Junio C Hamano1-4/+31
2014-10-21Merge branch 'da/mergetool-tool-help'Junio C Hamano1-1/+8
2014-10-21Merge branch 'da/mergetool-temporary-filename'Junio C Hamano1-5/+11
2014-10-16mergetool: add an option for writing to a temporary directoryDavid Aguilar1-4/+31
2014-10-16mergetool: use more conservative temporary filenamesDavid Aguilar1-5/+11
2014-10-15difftool: don't assume that default sh is saneCharles Bailey1-0/+4
2014-10-15mergetool: don't require a work tree for --tool-helpCharles Bailey1-1/+4
2014-10-15mergetool: use more conservative temporary filenamesDavid Aguilar1-5/+11
2014-06-09git-mergetool.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto1-2/+2
2014-04-22mergetool: run prompt only if guessed toolFelipe Contreras1-3/+11
2013-02-14Merge branch 'al/mergetool-printf-fix'Junio C Hamano1-1/+1
2013-02-08git-mergetool: print filename when it contains %Asheesh Laroia1-1/+1
2013-01-25git-mergetool: move show_tool_help to mergetool--libJohn Keeping1-37/+0
2012-08-23mergetool: style fixesJunio C Hamano1-273/+308
2012-07-23mergetool: support --tool-help option like difftool doesJunio C Hamano1-1/+41
2012-01-23mergetool: Provide an empty file when neededDavid Aguilar1-4/+8
2011-10-10Merge branch 'jm/mergetool-pathspec'Junio C Hamano1-49/+27
2011-09-26mergetool: no longer need to save standard inputJunio C Hamano1-6/+4
2011-09-26mergetool: Use args as pathspec to unmerged filesJonathon Mah1-48/+28
2011-09-19git-mergetool: check return value from readJay Soffian1-1/+1
2011-07-01mergetool: check return value from readJunio C Hamano1-4/+4
2011-04-13mergetool: Teach about submodulesJonathon Mah1-6/+84
2011-02-16mergetool: don't skip modify/remove conflictsMartin von Zweigbergk1-1/+1
2010-09-03Merge branch 'cb/maint-mergetool-no-tty'Junio C Hamano1-2/+6
2010-08-20mergetool: Remove explicit references to /dev/ttyCharles Bailey1-2/+6
2010-08-17mergetool: Skip autoresolved pathsDavid Aguilar1-5/+23
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar1-7/+8
2009-04-11Fix misspelled mergetool.keepBackupFerry Huberts1-1/+1
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar1-211/+13
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-20 10:15:07 +0000