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