Age | Commit message (Expand) | Author | Files | Lines |
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 |
2008-06-19 | Remove the use of '--' in merge program invocation | Patrick Higgins | 1 | -12/+12 |
2008-05-11 | mergetool: Make ECMerge use the settings as specified by the user in the GUI | Sebastian Schuberth | 1 | -2/+2 |
2008-03-05 | Teach git mergetool to use custom commands defined at config time | Charles Bailey | 1 | -2/+26 |
2008-03-05 | Changed an internal variable of mergetool to support custom commands | Charles Bailey | 1 | -50/+50 |
2008-03-05 | Tidy up git mergetool's backup file behaviour | Charles Bailey | 1 | -24/+13 |
2008-01-07 | Allow git-mergetool to handle paths with a leading space | Rogan Dawes | 1 | -2/+5 |
2007-12-05 | Open external merge tool with original file extensions for all three files | Pini Reznik | 1 | -4/+5 |
2007-11-06 | scripts: Add placeholders for OPTIONS_SPEC | Junio C Hamano | 1 | -0/+1 |
2007-10-18 | mergetool: avoid misleading message "Resetting to default..." | Steffen Prohaska | 1 | -1/+1 |
2007-10-18 | mergetool: add support for ECMerge | Steffen Prohaska | 1 | -1/+11 |
2007-10-18 | mergetool: use path to mergetool in config var mergetool.<tool>.path | Steffen Prohaska | 1 | -43/+54 |
2007-09-28 | mergetool: Fix typo in options passed to kdiff3 | Theodore Ts'o | 1 | -2/+2 |
2007-09-28 | mergetool: fix emerge when running in a subdirectory | Theodore Ts'o | 1 | -2/+2 |
2007-09-28 | Mergetool generating blank files (1.5.3) | Junio C Hamano | 1 | -3/+4 |
2007-09-23 | Supplant the "while case ... break ;; esac" idiom | David Kastrup | 1 | -1/+1 |
2007-07-02 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 1 | -8/+8 |
2007-06-10 | git-mergetool: Make default selection of merge-tool more intelligent | Theodore Ts'o | 1 | -17/+29 |
2007-06-10 | [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool | Dan McGee | 1 | -2/+10 |
2007-06-06 | Fix typo in git-mergetool | Josh Triplett | 1 | -1/+1 |
2007-03-29 | mergetool: Clean up description of files and prompts for merge resolutions | Theodore Ts'o | 1 | -12/+15 |
2007-03-29 | mergetool: Make git-rm quiet when resolving a deleted file conflict | Theodore Ts'o | 1 | -1/+1 |
2007-03-29 | mergetool: Add support for Apple Mac OS X's opendiff command | Theodore Ts'o | 1 | -2/+14 |
2007-03-29 | mergetool: Fix abort command when resolving symlinks and deleted files | Theodore Ts'o | 1 | -4/+4 |
2007-03-29 | mergetool: Remove spurious error message if merge.tool config option not set | Theodore Ts'o | 1 | -1/+1 |
2007-03-29 | mergetool: factor out common code | Theodore Ts'o | 1 | -42/+36 |
2007-03-29 | mergetool: portability fix: don't use reserved word function | Theodore Ts'o | 1 | -5/+5 |
2007-03-29 | mergetool: portability fix: don't assume true is in /bin | Theodore Ts'o | 1 | -2/+2 |
2007-03-29 | mergetool: Don't error out in the merge case where the local file is deleted | Theodore Ts'o | 1 | -6/+5 |
2007-03-29 | mergetool: Replace use of "echo -n" with printf(1) to be more portable | Theodore Ts'o | 1 | -14/+12 |
2007-03-18 | mergetool: print an appropriate warning if merge.tool is unknown | Theodore Ts'o | 1 | -4/+9 |
2007-03-18 | mergetool: Add support for vimdiff. | James Bowes | 1 | -3/+5 |
2007-03-13 | Add git-mergetool to run an appropriate merge conflict resolution program | Theodore Ts'o | 1 | -0/+352 |