| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
|/ |
|
* | mergetool: put the cursor on the editable file for Vim | Markus Heidelberg | 2009-01-18 | 1 | -2/+7 |
* | Merge branch 'cb/mergetool' | Junio C Hamano | 2009-01-01 | 1 | -30/+80 |
|\ |
|
| * | mergetool: Don't keep temporary merge files unless told to | Charles Bailey | 2008-12-12 | 1 | -0/+6 |
| * | mergetool: Add prompt to continue after failing to merge a file | Charles Bailey | 2008-12-12 | 1 | -9/+43 |
| * | Add -y/--no-prompt option to mergetool | Charles Bailey | 2008-11-14 | 1 | -3/+13 |
| * | Fix some tab/space inconsistencies in git-mergetool.sh | Charles Bailey | 2008-11-14 | 1 | -19/+19 |
* | | git-mergetool: properly handle "git mergetool -- filename" | David Aguilar | 2008-12-19 | 1 | -0/+1 |
|/ |
|
* | Remove the use of '--' in merge program invocation | Patrick Higgins | 2008-06-19 | 1 | -12/+12 |
* | mergetool: Make ECMerge use the settings as specified by the user in the GUI | Sebastian Schuberth | 2008-05-11 | 1 | -2/+2 |
* | Teach git mergetool to use custom commands defined at config time | Charles Bailey | 2008-03-05 | 1 | -2/+26 |
* | Changed an internal variable of mergetool to support custom commands | Charles Bailey | 2008-03-05 | 1 | -50/+50 |
* | Tidy up git mergetool's backup file behaviour | Charles Bailey | 2008-03-05 | 1 | -24/+13 |
* | Allow git-mergetool to handle paths with a leading space | Rogan Dawes | 2008-01-07 | 1 | -2/+5 |
* | Open external merge tool with original file extensions for all three files | Pini Reznik | 2007-12-05 | 1 | -4/+5 |
* | scripts: Add placeholders for OPTIONS_SPEC | Junio C Hamano | 2007-11-06 | 1 | -0/+1 |
* | mergetool: avoid misleading message "Resetting to default..." | Steffen Prohaska | 2007-10-18 | 1 | -1/+1 |
* | mergetool: add support for ECMerge | Steffen Prohaska | 2007-10-18 | 1 | -1/+11 |
* | mergetool: use path to mergetool in config var mergetool.<tool>.path | Steffen Prohaska | 2007-10-18 | 1 | -43/+54 |
* | mergetool: Fix typo in options passed to kdiff3 | Theodore Ts'o | 2007-09-28 | 1 | -2/+2 |
* | mergetool: fix emerge when running in a subdirectory | Theodore Ts'o | 2007-09-28 | 1 | -2/+2 |
* | Mergetool generating blank files (1.5.3) | Junio C Hamano | 2007-09-28 | 1 | -3/+4 |
* | Supplant the "while case ... break ;; esac" idiom | David Kastrup | 2007-09-23 | 1 | -1/+1 |
* | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 | 1 | -8/+8 |
* | git-mergetool: Make default selection of merge-tool more intelligent | Theodore Ts'o | 2007-06-10 | 1 | -17/+29 |
* | [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool | Dan McGee | 2007-06-10 | 1 | -2/+10 |
* | Fix typo in git-mergetool | Josh Triplett | 2007-06-06 | 1 | -1/+1 |
* | mergetool: Clean up description of files and prompts for merge resolutions | Theodore Ts'o | 2007-03-29 | 1 | -12/+15 |
* | mergetool: Make git-rm quiet when resolving a deleted file conflict | Theodore Ts'o | 2007-03-29 | 1 | -1/+1 |