| Commit message (Expand) | Author | Age |
* | Merge branch 'nf/mergetool-prompt' | Junio C Hamano | 2016-05-03 |
|\ |
|
| * | difftool/mergetool: make the form of yes/no questions consistent | Nikola Forró | 2016-04-25 |
* | | mergetool: honor tempfile configuration when resolving delete conflicts | David Aguilar | 2016-03-10 |
* | | mergetool: support delete/delete conflicts | David Aguilar | 2016-03-10 |
|/ |
|
* | mergetool--lib: set IFS for difftool and mergetool | David Aguilar | 2015-05-20 |
* | mergetool: simplify conditionals | David Aguilar | 2014-11-21 |
* | Merge branch 'da/mergetool-temporary-directory' | Junio C Hamano | 2014-10-21 |
|\ |
|
| * | mergetool: add an option for writing to a temporary directory | David Aguilar | 2014-10-16 |
* | | Merge branch 'da/mergetool-tool-help' | Junio C Hamano | 2014-10-21 |
|\ \ |
|
| * | | difftool: don't assume that default sh is sane | Charles Bailey | 2014-10-15 |
| * | | mergetool: don't require a work tree for --tool-help | Charles Bailey | 2014-10-15 |
| * | | mergetool: use more conservative temporary filenames | David Aguilar | 2014-10-15 |
* | | | Merge branch 'da/mergetool-temporary-filename' | Junio C Hamano | 2014-10-21 |
|\ \ \
| | |/
| |/| |
|
| * | | mergetool: use more conservative temporary filenames | David Aguilar | 2014-10-16 |
| |/ |
|
* | | git-mergetool.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 |
* | | mergetool: run prompt only if guessed tool | Felipe Contreras | 2014-04-22 |
|/ |
|
* | Merge branch 'al/mergetool-printf-fix' | Junio C Hamano | 2013-02-14 |
|\ |
|
| * | git-mergetool: print filename when it contains % | Asheesh Laroia | 2013-02-08 |
* | | git-mergetool: move show_tool_help to mergetool--lib | John Keeping | 2013-01-25 |
|/ |
|
* | mergetool: style fixes | Junio C Hamano | 2012-08-23 |
* | mergetool: support --tool-help option like difftool does | Junio C Hamano | 2012-07-23 |
* | mergetool: Provide an empty file when needed | David Aguilar | 2012-01-23 |
* | Merge branch 'jm/mergetool-pathspec' | Junio C Hamano | 2011-10-10 |
|\ |
|
| * | mergetool: no longer need to save standard input | Junio C Hamano | 2011-09-26 |
| * | mergetool: Use args as pathspec to unmerged files | Jonathon Mah | 2011-09-26 |
* | | git-mergetool: check return value from read | Jay Soffian | 2011-09-19 |
* | | mergetool: check return value from read | Junio C Hamano | 2011-07-01 |
|/ |
|
* | mergetool: Teach about submodules | Jonathon Mah | 2011-04-13 |
* | mergetool: don't skip modify/remove conflicts | Martin von Zweigbergk | 2011-02-16 |
* | Merge branch 'cb/maint-mergetool-no-tty' | Junio C Hamano | 2010-09-03 |
|\ |
|
| * | mergetool: Remove explicit references to /dev/tty | Charles Bailey | 2010-08-20 |
* | | mergetool: Skip autoresolved paths | David Aguilar | 2010-08-17 |
|/ |
|
* | mergetool--lib: simplify API usage by removing more global variables | David Aguilar | 2009-04-12 |
* | Fix misspelled mergetool.keepBackup | Ferry Huberts | 2009-04-11 |
* | difftool/mergetool: refactor commands to use git-mergetool--lib | David Aguilar | 2009-04-08 |
* | mergetool: use $( ... ) instead of `backticks` | David Aguilar | 2009-04-07 |
* | difftool/mergetool: add diffuse as merge and diff tool | Sebastian Pipping | 2009-04-07 |
* | git-mergetool: add new merge tool TortoiseMerge | Markus Heidelberg | 2009-04-07 |
* | git-mergetool/difftool: make (g)vimdiff workable under Windows | Markus Heidelberg | 2009-04-07 |
* | Merge branch 'cb/mergetool' | Junio C Hamano | 2009-02-05 |
|\ |
|
| * | mergetool: fix running mergetool in sub-directories | Charles Bailey | 2009-01-31 |
| * | mergetool: respect autocrlf by using checkout-index | Charles Bailey | 2009-01-27 |
* | | mergetool: Don't repeat merge tool candidates | Johannes Gilger | 2009-01-27 |
|/ |
|
* | mergetool: put the cursor on the editable file for Vim | Markus Heidelberg | 2009-01-18 |
* | Merge branch 'cb/mergetool' | Junio C Hamano | 2009-01-01 |
|\ |
|
| * | mergetool: Don't keep temporary merge files unless told to | Charles Bailey | 2008-12-12 |
| * | mergetool: Add prompt to continue after failing to merge a file | Charles Bailey | 2008-12-12 |
| * | Add -y/--no-prompt option to mergetool | Charles Bailey | 2008-11-14 |
| * | Fix some tab/space inconsistencies in git-mergetool.sh | Charles Bailey | 2008-11-14 |
* | | git-mergetool: properly handle "git mergetool -- filename" | David Aguilar | 2008-12-19 |
|/ |
|