summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
AgeCommit message (Expand)AuthorFilesLines
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
2009-04-07mergetool: use $( ... ) instead of `backticks`Libravatar David Aguilar1-8/+8
2009-04-07difftool/mergetool: add diffuse as merge and diff toolLibravatar Sebastian Pipping1-2/+2
2009-04-07git-mergetool: add new merge tool TortoiseMergeLibravatar Markus Heidelberg1-3/+13
2009-04-07git-mergetool/difftool: make (g)vimdiff workable under WindowsLibravatar Markus Heidelberg1-2/+8
2009-02-05Merge branch 'cb/mergetool'Libravatar Junio C Hamano1-4/+11
2009-01-31mergetool: fix running mergetool in sub-directoriesLibravatar Charles Bailey1-5/+4
2009-01-27mergetool: respect autocrlf by using checkout-indexLibravatar Charles Bailey1-3/+11
2009-01-27mergetool: Don't repeat merge tool candidatesLibravatar Johannes Gilger1-10/+8
2009-01-18mergetool: put the cursor on the editable file for VimLibravatar Markus Heidelberg1-2/+7
2009-01-01Merge branch 'cb/mergetool'Libravatar Junio C Hamano1-30/+80
2008-12-19git-mergetool: properly handle "git mergetool -- filename"Libravatar David Aguilar1-0/+1
2008-12-12mergetool: Don't keep temporary merge files unless told toLibravatar Charles Bailey1-0/+6
2008-12-12mergetool: Add prompt to continue after failing to merge a fileLibravatar Charles Bailey1-9/+43
2008-11-14Add -y/--no-prompt option to mergetoolLibravatar Charles Bailey1-3/+13
2008-11-14Fix some tab/space inconsistencies in git-mergetool.shLibravatar Charles Bailey1-19/+19
2008-06-19Remove the use of '--' in merge program invocationLibravatar Patrick Higgins1-12/+12
2008-05-11mergetool: Make ECMerge use the settings as specified by the user in the GUILibravatar Sebastian Schuberth1-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 07:20:48 +0000