summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
AgeCommit message (Expand)Author
2011-09-26mergetool: no longer need to save standard inputJunio C Hamano
2011-09-26mergetool: Use args as pathspec to unmerged filesJonathon Mah
2011-04-13mergetool: Teach about submodulesJonathon Mah
2011-02-16mergetool: don't skip modify/remove conflictsMartin von Zweigbergk
2010-09-03Merge branch 'cb/maint-mergetool-no-tty'Junio C Hamano
2010-08-20mergetool: Remove explicit references to /dev/ttyCharles Bailey
2010-08-17mergetool: Skip autoresolved pathsDavid Aguilar
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar
2009-04-11Fix misspelled mergetool.keepBackupFerry Huberts
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar
2009-04-08mergetool: use $( ... ) instead of `backticks`David Aguilar
2009-04-08difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping
2009-04-08git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg
2009-04-08git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg
2009-02-06Merge branch 'cb/mergetool'Junio C Hamano
2009-01-31mergetool: fix running mergetool in sub-directoriesCharles Bailey
2009-01-27mergetool: respect autocrlf by using checkout-indexCharles Bailey
2009-01-27mergetool: Don't repeat merge tool candidatesJohannes Gilger
2009-01-18mergetool: put the cursor on the editable file for VimMarkus Heidelberg
2009-01-01Merge branch 'cb/mergetool'Junio C Hamano
2008-12-20git-mergetool: properly handle "git mergetool -- filename"David Aguilar
2008-12-13mergetool: Don't keep temporary merge files unless told toCharles Bailey
2008-12-13mergetool: Add prompt to continue after failing to merge a fileCharles Bailey
2008-11-15Add -y/--no-prompt option to mergetoolCharles Bailey
2008-11-15Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey
2008-06-19Remove the use of '--' in merge program invocationPatrick Higgins
2008-05-11mergetool: Make ECMerge use the settings as specified by the user in the GUISebastian Schuberth
2008-03-05Teach git mergetool to use custom commands defined at config timeCharles Bailey
2008-03-05Changed an internal variable of mergetool to support custom commandsCharles Bailey
2008-03-05Tidy up git mergetool's backup file behaviourCharles Bailey
2008-01-08Allow git-mergetool to handle paths with a leading spaceRogan Dawes
2007-12-06Open external merge tool with original file extensions for all three filesPini Reznik
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano
2007-10-18mergetool: avoid misleading message "Resetting to default..."Steffen Prohaska
2007-10-18mergetool: add support for ECMergeSteffen Prohaska
2007-10-18mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska
2007-09-29mergetool: Fix typo in options passed to kdiff3Theodore Ts'o
2007-09-29mergetool: fix emerge when running in a subdirectoryTheodore Ts'o
2007-09-29Mergetool generating blank files (1.5.3)Junio C Hamano
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup
2007-07-03Rewrite "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-30mergetool: 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