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