summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
AgeCommit message (Expand)AuthorFilesLines
2021-03-13mergetool: do not enable hideResolved by defaultLibravatar Jonathan Nieder1-7/+2
2021-02-09mergetool: add per-tool support and overrides for the hideResolved flagLibravatar Seth House1-1/+35
2021-02-09mergetool: break setup_tool out into separate initialization functionLibravatar Seth House1-0/+2
2021-02-09mergetool: add hideResolved configurationLibravatar Seth House1-0/+14
2019-06-12mergetool: use shell variable magic instead of `awk`Libravatar Johannes Sixt1-5/+20
2019-06-12mergetool: dissect strings with shell variable magic instead of `expr`Libravatar Johannes Sixt1-9/+11
2019-05-13mergetool: use get_merge_tool functionLibravatar Denton Liu1-8/+4
2018-10-25mergetool: accept -g/--[no-]gui as argumentsLibravatar Denton Liu1-2/+9
2018-08-13mergetool: don't suggest to continue after last fileLibravatar Nicholas Guriev1-3/+5
2017-01-10mergetool: fix running in subdir when rerere enabledLibravatar Richard Hansen1-2/+15
2017-01-10mergetool: take the "-O" out of $orderfileLibravatar Richard Hansen1-2/+2
2016-10-11mergetool: honor -O<orderfile>Libravatar David Aguilar1-2/+7
2016-10-11mergetool: honor diff.orderFileLibravatar David Aguilar1-15/+15
2016-10-11mergetool: move main program flow into a main() functionLibravatar David Aguilar1-87/+93
2016-10-11mergetool: add copyrightLibravatar David Aguilar1-0/+1
2016-05-03Merge branch 'nf/mergetool-prompt'Libravatar Junio C Hamano1-1/+1
2016-04-25difftool/mergetool: make the form of yes/no questions consistentLibravatar Nikola Forró1-1/+1
2016-03-10mergetool: honor tempfile configuration when resolving delete conflictsLibravatar David Aguilar1-1/+10
2016-03-10mergetool: support delete/delete conflictsLibravatar David Aguilar1-3/+11
2015-05-20mergetool--lib: set IFS for difftool and mergetoolLibravatar David Aguilar1-2/+0
2014-11-21mergetool: simplify conditionalsLibravatar David Aguilar1-11/+5
2014-10-21Merge branch 'da/mergetool-temporary-directory'Libravatar Junio C Hamano1-4/+31
2014-10-21Merge branch 'da/mergetool-tool-help'Libravatar Junio C Hamano1-1/+8
2014-10-21Merge branch 'da/mergetool-temporary-filename'Libravatar Junio C Hamano1-5/+11
2014-10-16mergetool: add an option for writing to a temporary directoryLibravatar David Aguilar1-4/+31
2014-10-16mergetool: use more conservative temporary filenamesLibravatar David Aguilar1-5/+11
2014-10-15difftool: don't assume that default sh is saneLibravatar Charles Bailey1-0/+4
2014-10-15mergetool: don't require a work tree for --tool-helpLibravatar Charles Bailey1-1/+4
2014-10-15mergetool: use more conservative temporary filenamesLibravatar David Aguilar1-5/+11
2014-06-09git-mergetool.sh: avoid "test <cond> -a/-o <cond>"Libravatar Elia Pinto1-2/+2
2014-04-22mergetool: run prompt only if guessed toolLibravatar Felipe Contreras1-3/+11
2013-02-14Merge branch 'al/mergetool-printf-fix'Libravatar Junio C Hamano1-1/+1
2013-02-08git-mergetool: print filename when it contains %Libravatar Asheesh Laroia1-1/+1
2013-01-25git-mergetool: move show_tool_help to mergetool--libLibravatar John Keeping1-37/+0
2012-08-23mergetool: style fixesLibravatar Junio C Hamano1-273/+308
2012-07-23mergetool: support --tool-help option like difftool doesLibravatar Junio C Hamano1-1/+41
2012-01-23mergetool: Provide an empty file when neededLibravatar David Aguilar1-4/+8
2011-10-10Merge branch 'jm/mergetool-pathspec'Libravatar Junio C Hamano1-49/+27
2011-09-26mergetool: no longer need to save standard inputLibravatar Junio C Hamano1-6/+4
2011-09-26mergetool: Use args as pathspec to unmerged filesLibravatar Jonathon Mah1-48/+28
2011-09-19git-mergetool: check return value from readLibravatar Jay Soffian1-1/+1
2011-07-01mergetool: check return value from readLibravatar Junio C Hamano1-4/+4
2011-04-13mergetool: Teach about submodulesLibravatar Jonathon Mah1-6/+84
2011-02-16mergetool: don't skip modify/remove conflictsLibravatar Martin von Zweigbergk1-1/+1
2010-09-03Merge branch 'cb/maint-mergetool-no-tty'Libravatar Junio C Hamano1-2/+6
2010-08-20mergetool: Remove explicit references to /dev/ttyLibravatar Charles Bailey1-2/+6
2010-08-17mergetool: Skip autoresolved pathsLibravatar David Aguilar1-5/+23
2009-04-12mergetool--lib: simplify API usage by removing more global variablesLibravatar David Aguilar1-7/+8
2009-04-11Fix misspelled mergetool.keepBackupLibravatar Ferry Huberts1-1/+1
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libLibravatar David Aguilar1-211/+13
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 17:48:27 +0000