summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
AgeCommit message (Expand)AuthorFilesLines
2009-04-12mergetool--lib: simplify API usage by removing more global variablesLibravatar David Aguilar1-7/+8
2009-04-11Fix misspelled mergetool.keepBackupLibravatar Ferry Huberts1-1/+1
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libLibravatar David Aguilar1-211/+13
2009-04-07mergetool: use $( ... ) instead of `backticks`Libravatar David Aguilar1-8/+8
2009-04-07difftool/mergetool: add diffuse as merge and diff toolLibravatar Sebastian Pipping1-2/+2
2009-04-07git-mergetool: add new merge tool TortoiseMergeLibravatar Markus Heidelberg1-3/+13
2009-04-07git-mergetool/difftool: make (g)vimdiff workable under WindowsLibravatar Markus Heidelberg1-2/+8
2009-02-05Merge branch 'cb/mergetool'Libravatar Junio C Hamano1-4/+11
2009-01-31mergetool: fix running mergetool in sub-directoriesLibravatar Charles Bailey1-5/+4
2009-01-27mergetool: respect autocrlf by using checkout-indexLibravatar Charles Bailey1-3/+11
2009-01-27mergetool: Don't repeat merge tool candidatesLibravatar Johannes Gilger1-10/+8
2009-01-18mergetool: put the cursor on the editable file for VimLibravatar Markus Heidelberg1-2/+7
2009-01-01Merge branch 'cb/mergetool'Libravatar Junio C Hamano1-30/+80
2008-12-19git-mergetool: properly handle "git mergetool -- filename"Libravatar David Aguilar1-0/+1
2008-12-12mergetool: Don't keep temporary merge files unless told toLibravatar Charles Bailey1-0/+6
2008-12-12mergetool: Add prompt to continue after failing to merge a fileLibravatar Charles Bailey1-9/+43
2008-11-14Add -y/--no-prompt option to mergetoolLibravatar Charles Bailey1-3/+13
2008-11-14Fix some tab/space inconsistencies in git-mergetool.shLibravatar Charles Bailey1-19/+19
2008-06-19Remove the use of '--' in merge program invocationLibravatar Patrick Higgins1-12/+12
2008-05-11mergetool: Make ECMerge use the settings as specified by the user in the GUILibravatar Sebastian Schuberth1-2/+2
2008-03-05Teach git mergetool to use custom commands defined at config timeLibravatar Charles Bailey1-2/+26
2008-03-05Changed an internal variable of mergetool to support custom commandsLibravatar Charles Bailey1-50/+50
2008-03-05Tidy up git mergetool's backup file behaviourLibravatar Charles Bailey1-24/+13
2008-01-07Allow git-mergetool to handle paths with a leading spaceLibravatar Rogan Dawes1-2/+5
2007-12-05Open external merge tool with original file extensions for all three filesLibravatar Pini Reznik1-4/+5
2007-11-06scripts: Add placeholders for OPTIONS_SPECLibravatar Junio C Hamano1-0/+1
2007-10-18mergetool: avoid misleading message "Resetting to default..."Libravatar Steffen Prohaska1-1/+1
2007-10-18mergetool: add support for ECMergeLibravatar Steffen Prohaska1-1/+11
2007-10-18mergetool: use path to mergetool in config var mergetool.<tool>.pathLibravatar Steffen Prohaska1-43/+54
2007-09-28mergetool: Fix typo in options passed to kdiff3Libravatar Theodore Ts'o1-2/+2
2007-09-28mergetool: fix emerge when running in a subdirectoryLibravatar Theodore Ts'o1-2/+2
2007-09-28Mergetool generating blank files (1.5.3)Libravatar Junio C Hamano1-3/+4
2007-09-23Supplant the "while case ... break ;; esac" idiomLibravatar David Kastrup1-1/+1
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-8/+8
2007-06-10git-mergetool: Make default selection of merge-tool more intelligentLibravatar Theodore Ts'o1-17/+29
2007-06-10[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolLibravatar Dan McGee1-2/+10
2007-06-06Fix typo in git-mergetoolLibravatar Josh Triplett1-1/+1
2007-03-29mergetool: Clean up description of files and prompts for merge resolutionsLibravatar Theodore Ts'o1-12/+15
2007-03-29mergetool: Make git-rm quiet when resolving a deleted file conflictLibravatar Theodore Ts'o1-1/+1
2007-03-29mergetool: Add support for Apple Mac OS X's opendiff commandLibravatar Theodore Ts'o1-2/+14
2007-03-29mergetool: Fix abort command when resolving symlinks and deleted filesLibravatar Theodore Ts'o1-4/+4
2007-03-29mergetool: Remove spurious error message if merge.tool config option not setLibravatar Theodore Ts'o1-1/+1
2007-03-29mergetool: factor out common codeLibravatar Theodore Ts'o1-42/+36
2007-03-29mergetool: portability fix: don't use reserved word functionLibravatar Theodore Ts'o1-5/+5
2007-03-29mergetool: portability fix: don't assume true is in /binLibravatar Theodore Ts'o1-2/+2
2007-03-29mergetool: Don't error out in the merge case where the local file is deletedLibravatar Theodore Ts'o1-6/+5
2007-03-29mergetool: Replace use of "echo -n" with printf(1) to be more portableLibravatar Theodore Ts'o1-14/+12
2007-03-18mergetool: print an appropriate warning if merge.tool is unknownLibravatar Theodore Ts'o1-4/+9
2007-03-18mergetool: Add support for vimdiff.Libravatar James Bowes1-3/+5
2007-03-13Add git-mergetool to run an appropriate merge conflict resolution programLibravatar Theodore Ts'o1-0/+352
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:37:45 +0000