path: root/
AgeCommit message (Expand)Author
2008-03-05Teach git mergetool to use custom commands defined at config timeCharles Bailey
2008-03-05Changed an internal variable of mergetool to support custom commandsCharles Bailey
2008-03-05Tidy up git mergetool's backup file behaviourCharles Bailey
2008-01-08Allow git-mergetool to handle paths with a leading spaceRogan Dawes
2007-12-06Open external merge tool with original file extensions for all three filesPini Reznik
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano
2007-10-18mergetool: avoid misleading message "Resetting to default..."Steffen Prohaska
2007-10-18mergetool: add support for ECMergeSteffen Prohaska
2007-10-18mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska
2007-09-29mergetool: Fix typo in options passed to kdiff3Theodore Ts'o
2007-09-29mergetool: fix emerge when running in a subdirectoryTheodore Ts'o
2007-09-29Mergetool generating blank files (1.5.3)Junio C Hamano
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-06-10git-mergetool: Make default selection of merge-tool more intelligentTheodore Ts'o
2007-06-10[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee
2007-06-06Fix typo in git-mergetoolJosh Triplett
2007-03-30mergetool: Clean up description of files and prompts for merge resolutionsTheodore Ts'o
2007-03-29mergetool: Make git-rm quiet when resolving a deleted file conflictTheodore Ts'o
2007-03-29mergetool: Add support for Apple Mac OS X's opendiff commandTheodore Ts'o
2007-03-29mergetool: Fix abort command when resolving symlinks and deleted filesTheodore Ts'o
2007-03-29mergetool: Remove spurious error message if merge.tool config option not setTheodore Ts'o
2007-03-29mergetool: factor out common codeTheodore Ts'o
2007-03-29mergetool: portability fix: don't use reserved word functionTheodore Ts'o
2007-03-29mergetool: portability fix: don't assume true is in /binTheodore Ts'o
2007-03-29mergetool: Don't error out in the merge case where the local file is deletedTheodore Ts'o
2007-03-29mergetool: Replace use of "echo -n" with printf(1) to be more portableTheodore Ts'o
2007-03-19mergetool: print an appropriate warning if merge.tool is unknownTheodore Ts'o
2007-03-19mergetool: Add support for vimdiff.James Bowes
2007-03-14Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o