summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
AgeCommit message (Expand)Author
2007-07-02Rewrite "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-29mergetool: 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-18mergetool: print an appropriate warning if merge.tool is unknownTheodore Ts'o
2007-03-18mergetool: Add support for vimdiff.James Bowes
2007-03-13Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-13 04:07:23 +0000