summaryrefslogtreecommitdiffstats
path: root/git-mergetool.sh
AgeCommit message (Expand)AuthorLines
2016-05-03Merge branch 'nf/mergetool-prompt'Junio C Hamano-1/+1
2016-04-25difftool/mergetool: make the form of yes/no questions consistentNikola Forró-1/+1
2016-03-10mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar-1/+10
2016-03-10mergetool: support delete/delete conflictsDavid Aguilar-3/+11
2015-05-20mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar-2/+0
2014-11-21mergetool: simplify conditionalsDavid Aguilar-11/+5
2014-10-21Merge branch 'da/mergetool-temporary-directory'Junio C Hamano-4/+31
2014-10-21Merge branch 'da/mergetool-tool-help'Junio C Hamano-1/+8
2014-10-21Merge branch 'da/mergetool-temporary-filename'Junio C Hamano-5/+11
2014-10-16mergetool: add an option for writing to a temporary directoryDavid Aguilar-4/+31
2014-10-16mergetool: use more conservative temporary filenamesDavid Aguilar-5/+11
2014-10-15difftool: don't assume that default sh is saneCharles Bailey-0/+4
2014-10-15mergetool: don't require a work tree for --tool-helpCharles Bailey-1/+4
2014-10-15mergetool: use more conservative temporary filenamesDavid Aguilar-5/+11
2014-06-09git-mergetool.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto-2/+2
2014-04-22mergetool: run prompt only if guessed toolFelipe Contreras-3/+11
2013-02-14Merge branch 'al/mergetool-printf-fix'Junio C Hamano-1/+1
2013-02-08git-mergetool: print filename when it contains %Asheesh Laroia-1/+1
2013-01-25git-mergetool: move show_tool_help to mergetool--libJohn Keeping-37/+0
2012-08-23mergetool: style fixesJunio C Hamano-273/+308
2012-07-23mergetool: support --tool-help option like difftool doesJunio C Hamano-1/+41
2012-01-23mergetool: Provide an empty file when neededDavid Aguilar-4/+8
2011-10-10Merge branch 'jm/mergetool-pathspec'Junio C Hamano-49/+27
2011-09-26mergetool: no longer need to save standard inputJunio C Hamano-6/+4
2011-09-26mergetool: Use args as pathspec to unmerged filesJonathon Mah-48/+28
2011-09-19git-mergetool: check return value from readJay Soffian-1/+1
2011-07-01mergetool: check return value from readJunio C Hamano-4/+4
2011-04-13mergetool: Teach about submodulesJonathon Mah-6/+84
2011-02-16mergetool: don't skip modify/remove conflictsMartin von Zweigbergk-1/+1
2010-09-03Merge branch 'cb/maint-mergetool-no-tty'Junio C Hamano-2/+6
2010-08-20mergetool: Remove explicit references to /dev/ttyCharles Bailey-2/+6
2010-08-17mergetool: Skip autoresolved pathsDavid Aguilar-5/+23
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar-7/+8
2009-04-11Fix misspelled mergetool.keepBackupFerry Huberts-1/+1
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar-211/+13
2009-04-07mergetool: use $( ... ) instead of `backticks`David Aguilar-8/+8
2009-04-07difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping-2/+2
2009-04-07git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg-3/+13
2009-04-07git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg-2/+8
2009-02-05Merge branch 'cb/mergetool'Junio C Hamano-4/+11
2009-01-31mergetool: fix running mergetool in sub-directoriesCharles Bailey-5/+4
2009-01-27mergetool: respect autocrlf by using checkout-indexCharles Bailey-3/+11
2009-01-27mergetool: Don't repeat merge tool candidatesJohannes Gilger-10/+8
2009-01-18mergetool: put the cursor on the editable file for VimMarkus Heidelberg-2/+7
2009-01-01Merge branch 'cb/mergetool'Junio C Hamano-30/+80
2008-12-19git-mergetool: properly handle "git mergetool -- filename"David Aguilar-0/+1
2008-12-12mergetool: Don't keep temporary merge files unless told toCharles Bailey-0/+6
2008-12-12mergetool: Add prompt to continue after failing to merge a fileCharles Bailey-9/+43
2008-11-14Add -y/--no-prompt option to mergetoolCharles Bailey-3/+13
2008-11-14Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey-19/+19
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-01 23:33:27 +0000