aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
Commit message (Expand)AuthorAge
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* git-mergetool: Make default selection of merge-tool more intelligentTheodore Ts'o2007-06-10
* [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee2007-06-10
* Fix typo in git-mergetoolJosh Triplett2007-06-06
* mergetool: Clean up description of files and prompts for merge resolutionsTheodore Ts'o2007-03-29
* mergetool: Make git-rm quiet when resolving a deleted file conflictTheodore Ts'o2007-03-29
* mergetool: Add support for Apple Mac OS X's opendiff commandTheodore Ts'o2007-03-29
* mergetool: Fix abort command when resolving symlinks and deleted filesTheodore Ts'o2007-03-29
* mergetool: Remove spurious error message if merge.tool config option not setTheodore Ts'o2007-03-29
* mergetool: factor out common codeTheodore Ts'o2007-03-29
* mergetool: portability fix: don't use reserved word functionTheodore Ts'o2007-03-29
* mergetool: portability fix: don't assume true is in /binTheodore Ts'o2007-03-29
* mergetool: Don't error out in the merge case where the local file is deletedTheodore Ts'o2007-03-29
* mergetool: Replace use of "echo -n" with printf(1) to be more portableTheodore Ts'o2007-03-29
* mergetool: print an appropriate warning if merge.tool is unknownTheodore Ts'o2007-03-18
* mergetool: Add support for vimdiff.James Bowes2007-03-18
* Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o2007-03-13
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-01 18:13:38 +0000