summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
Commit message (Expand)AuthorAgeFilesLines
* mergetool: don't skip modify/remove conflictsMartin von Zweigbergk2011-02-161-1/+1
* Merge branch 'cb/maint-mergetool-no-tty'Junio C Hamano2010-09-031-2/+6
|\
| * mergetool: Remove explicit references to /dev/ttyCharles Bailey2010-08-201-2/+6
* | mergetool: Skip autoresolved pathsDavid Aguilar2010-08-171-5/+23
|/
* mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-121-7/+8
* Fix misspelled mergetool.keepBackupFerry Huberts2009-04-111-1/+1
* difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-081-211/+13
* mergetool: use $( ... ) instead of `backticks`David Aguilar2009-04-071-8/+8
* difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping2009-04-071-2/+2
* git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg2009-04-071-3/+13
* git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg2009-04-071-2/+8
* Merge branch 'cb/mergetool'Junio C Hamano2009-02-051-4/+11
|\
| * mergetool: fix running mergetool in sub-directoriesCharles Bailey2009-01-311-5/+4
| * mergetool: respect autocrlf by using checkout-indexCharles Bailey2009-01-271-3/+11
* | mergetool: Don't repeat merge tool candidatesJohannes Gilger2009-01-271-10/+8
|/
* mergetool: put the cursor on the editable file for VimMarkus Heidelberg2009-01-181-2/+7
* Merge branch 'cb/mergetool'Junio C Hamano2009-01-011-30/+80
|\
| * mergetool: Don't keep temporary merge files unless told toCharles Bailey2008-12-121-0/+6
| * mergetool: Add prompt to continue after failing to merge a fileCharles Bailey2008-12-121-9/+43
| * Add -y/--no-prompt option to mergetoolCharles Bailey2008-11-141-3/+13
| * Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey2008-11-141-19/+19
* | git-mergetool: properly handle "git mergetool -- filename"David Aguilar2008-12-191-0/+1
|/
* Remove the use of '--' in merge program invocationPatrick Higgins2008-06-191-12/+12
* mergetool: Make ECMerge use the settings as specified by the user in the GUISebastian Schuberth2008-05-111-2/+2
* Teach git mergetool to use custom commands defined at config timeCharles Bailey2008-03-051-2/+26
* Changed an internal variable of mergetool to support custom commandsCharles Bailey2008-03-051-50/+50
* Tidy up git mergetool's backup file behaviourCharles Bailey2008-03-051-24/+13
* Allow git-mergetool to handle paths with a leading spaceRogan Dawes2008-01-071-2/+5
* Open external merge tool with original file extensions for all three filesPini Reznik2007-12-051-4/+5
* scripts: Add placeholders for OPTIONS_SPECJunio C Hamano2007-11-061-0/+1
* mergetool: avoid misleading message "Resetting to default..."Steffen Prohaska2007-10-181-1/+1
* mergetool: add support for ECMergeSteffen Prohaska2007-10-181-1/+11
* mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska2007-10-181-43/+54
* mergetool: Fix typo in options passed to kdiff3Theodore Ts'o2007-09-281-2/+2
* mergetool: fix emerge when running in a subdirectoryTheodore Ts'o2007-09-281-2/+2
* Mergetool generating blank files (1.5.3)Junio C Hamano2007-09-281-3/+4
* Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-231-1/+1
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-8/+8
* git-mergetool: Make default selection of merge-tool more intelligentTheodore Ts'o2007-06-101-17/+29
* [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee2007-06-101-2/+10
* Fix typo in git-mergetoolJosh Triplett2007-06-061-1/+1
* mergetool: Clean up description of files and prompts for merge resolutionsTheodore Ts'o2007-03-291-12/+15
* mergetool: Make git-rm quiet when resolving a deleted file conflictTheodore Ts'o2007-03-291-1/+1
* mergetool: Add support for Apple Mac OS X's opendiff commandTheodore Ts'o2007-03-291-2/+14
* mergetool: Fix abort command when resolving symlinks and deleted filesTheodore Ts'o2007-03-291-4/+4
* mergetool: Remove spurious error message if merge.tool config option not setTheodore Ts'o2007-03-291-1/+1
* mergetool: factor out common codeTheodore Ts'o2007-03-291-42/+36
* mergetool: portability fix: don't use reserved word functionTheodore Ts'o2007-03-291-5/+5
* mergetool: portability fix: don't assume true is in /binTheodore Ts'o2007-03-291-2/+2
* mergetool: Don't error out in the merge case where the local file is deletedTheodore Ts'o2007-03-291-6/+5
View Lorry Controller Status