summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
Commit message (Expand)AuthorAgeFilesLines
* mergetool: fix running in subdir when rerere enabledrh/mergetool-regression-fixRichard Hansen2017-01-101-2/+15
* mergetool: take the "-O" out of $orderfileRichard Hansen2017-01-101-2/+2
* mergetool: honor -O<orderfile>da/mergetool-diff-orderDavid Aguilar2016-10-111-2/+7
* mergetool: honor diff.orderFileDavid Aguilar2016-10-111-15/+15
* mergetool: move main program flow into a main() functionDavid Aguilar2016-10-111-87/+93
* mergetool: add copyrightDavid Aguilar2016-10-111-0/+1
* Merge branch 'nf/mergetool-prompt'Junio C Hamano2016-05-031-1/+1
|\
| * difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-promptNikola Forró2016-04-251-1/+1
* | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflictDavid Aguilar2016-03-101-1/+10
* | mergetool: support delete/delete conflictsDavid Aguilar2016-03-101-3/+11
|/
* mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar2015-05-201-2/+0
* mergetool: simplify conditionalsDavid Aguilar2014-11-211-11/+5
* Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-211-4/+31
|\
| * mergetool: add an option for writing to a temporary directoryDavid Aguilar2014-10-161-4/+31
* | Merge branch 'da/mergetool-tool-help'Junio C Hamano2014-10-211-1/+8
|\ \
| * | difftool: don't assume that default sh is saneda/mergetool-tool-helpCharles Bailey2014-10-151-0/+4
| * | mergetool: don't require a work tree for --tool-helpCharles Bailey2014-10-151-1/+4
| * | mergetool: use more conservative temporary filenamesDavid Aguilar2014-10-151-5/+11
* | | Merge branch 'da/mergetool-temporary-filename'Junio C Hamano2014-10-211-5/+11
|\ \ \ | | |/ | |/|
| * | mergetool: use more conservative temporary filenamesda/mergetool-temporary-filenameDavid Aguilar2014-10-161-5/+11
| |/
* | git-mergetool.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
* | mergetool: run prompt only if guessed toolFelipe Contreras2014-04-221-3/+11
|/
* Merge branch 'al/mergetool-printf-fix'Junio C Hamano2013-02-141-1/+1
|\
| * git-mergetool: print filename when it contains %Asheesh Laroia2013-02-081-1/+1
* | git-mergetool: move show_tool_help to mergetool--libJohn Keeping2013-01-251-37/+0
|/
* mergetool: style fixesJunio C Hamano2012-08-231-273/+308
* mergetool: support --tool-help option like difftool doesJunio C Hamano2012-07-231-1/+41
* mergetool: Provide an empty file when neededda/maint-mergetool-twowayDavid Aguilar2012-01-231-4/+8
* Merge branch 'jm/mergetool-pathspec'Junio C Hamano2011-10-101-49/+27
|\
| * mergetool: no longer need to save standard inputJunio C Hamano2011-09-261-6/+4
| * mergetool: Use args as pathspec to unmerged filesJonathon Mah2011-09-261-48/+28
* | git-mergetool: check return value from readJay Soffian2011-09-191-1/+1
* | mergetool: check return value from readJunio C Hamano2011-07-011-4/+4
|/
* mergetool: Teach about submodulesJonathon Mah2011-04-131-6/+84
* mergetool: don't skip modify/remove conflictsMartin von Zweigbergk2011-02-161-1/+1
* Merge branch 'cb/maint-mergetool-no-tty'Junio C Hamano2010-09-031-2/+6
|\
| * mergetool: Remove explicit references to /dev/ttyCharles Bailey2010-08-201-2/+6
* | mergetool: Skip autoresolved pathsDavid Aguilar2010-08-171-5/+23
|/
* mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-121-7/+8
* Fix misspelled mergetool.keepBackupFerry Huberts2009-04-111-1/+1
* difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-081-211/+13
* mergetool: use $( ... ) instead of `backticks`David Aguilar2009-04-071-8/+8
* difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping2009-04-071-2/+2
* git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg2009-04-071-3/+13
* git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg2009-04-071-2/+8
* Merge branch 'cb/mergetool'Junio C Hamano2009-02-051-4/+11
|\
| * mergetool: fix running mergetool in sub-directoriesCharles Bailey2009-01-311-5/+4
| * mergetool: respect autocrlf by using checkout-indexCharles Bailey2009-01-271-3/+11
* | mergetool: Don't repeat merge tool candidatesJohannes Gilger2009-01-271-10/+8
|/
* mergetool: put the cursor on the editable file for VimMarkus Heidelberg2009-01-181-2/+7
View Lorry Controller Status