| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | mergetool: Add support for Apple Mac OS X's opendiff command | Theodore Ts'o | 2007-03-29 | 1 | -2/+14 |
* | mergetool: Fix abort command when resolving symlinks and deleted files | Theodore Ts'o | 2007-03-29 | 1 | -4/+4 |
* | mergetool: Remove spurious error message if merge.tool config option not set | Theodore Ts'o | 2007-03-29 | 1 | -1/+1 |
* | mergetool: factor out common code | Theodore Ts'o | 2007-03-29 | 1 | -42/+36 |
* | mergetool: portability fix: don't use reserved word function | Theodore Ts'o | 2007-03-29 | 1 | -5/+5 |
* | mergetool: portability fix: don't assume true is in /bin | Theodore Ts'o | 2007-03-29 | 1 | -2/+2 |
* | mergetool: Don't error out in the merge case where the local file is deleted | Theodore Ts'o | 2007-03-29 | 1 | -6/+5 |
* | mergetool: Replace use of "echo -n" with printf(1) to be more portable | Theodore Ts'o | 2007-03-29 | 1 | -14/+12 |
* | mergetool: print an appropriate warning if merge.tool is unknown | Theodore Ts'o | 2007-03-18 | 1 | -4/+9 |
* | mergetool: Add support for vimdiff. | James Bowes | 2007-03-18 | 1 | -3/+5 |
* | Add git-mergetool to run an appropriate merge conflict resolution program | Theodore Ts'o | 2007-03-13 | 1 | -0/+352 |