aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
Commit message (Expand)AuthorAge
...
| * mergetool: Add prompt to continue after failing to merge a fileCharles Bailey2008-12-12
| * Add -y/--no-prompt option to mergetoolCharles Bailey2008-11-14
| * Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey2008-11-14
* | git-mergetool: properly handle "git mergetool -- filename"David Aguilar2008-12-19
|/
* Remove the use of '--' in merge program invocationPatrick Higgins2008-06-19
* mergetool: Make ECMerge use the settings as specified by the user in the GUISebastian Schuberth2008-05-11
* Teach git mergetool to use custom commands defined at config timeCharles Bailey2008-03-05
* Changed an internal variable of mergetool to support custom commandsCharles Bailey2008-03-05
* Tidy up git mergetool's backup file behaviourCharles Bailey2008-03-05
* Allow git-mergetool to handle paths with a leading spaceRogan Dawes2008-01-07
* Open external merge tool with original file extensions for all three filesPini Reznik2007-12-05
* scripts: Add placeholders for OPTIONS_SPECJunio C Hamano2007-11-06
* mergetool: avoid misleading message "Resetting to default..."Steffen Prohaska2007-10-18
* mergetool: add support for ECMergeSteffen Prohaska2007-10-18
* mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska2007-10-18
* mergetool: Fix typo in options passed to kdiff3Theodore Ts'o2007-09-28
* mergetool: fix emerge when running in a subdirectoryTheodore Ts'o2007-09-28
* Mergetool generating blank files (1.5.3)Junio C Hamano2007-09-28
* Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-23
* 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-12-26 04:43:06 +0000