aboutsummaryrefslogtreecommitdiffstats
path: root/git-mergetool.sh
AgeCommit message (Expand)AuthorFilesLines
2023-04-05mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks1-2/+7
2021-03-13mergetool: do not enable hideResolved by defaultJonathan Nieder1-7/+2
2021-02-09mergetool: add per-tool support and overrides for the hideResolved flagSeth House1-1/+35
2021-02-09mergetool: break setup_tool out into separate initialization functionSeth House1-0/+2
2021-02-09mergetool: add hideResolved configurationSeth House1-0/+14
2019-06-12mergetool: use shell variable magic instead of `awk`Johannes Sixt1-5/+20
2019-06-12mergetool: dissect strings with shell variable magic instead of `expr`Johannes Sixt1-9/+11
2019-05-13mergetool: use get_merge_tool functionDenton Liu1-8/+4
2018-10-25mergetool: accept -g/--[no-]gui as argumentsDenton Liu1-2/+9
2018-08-13mergetool: don't suggest to continue after last fileNicholas Guriev1-3/+5
2017-01-10mergetool: fix running in subdir when rerere enabledRichard Hansen1-2/+15
2017-01-10mergetool: take the "-O" out of $orderfileRichard Hansen1-2/+2
2016-10-11mergetool: honor -O<orderfile>David Aguilar1-2/+7
2016-10-11mergetool: honor diff.orderFileDavid Aguilar1-15/+15
2016-10-11mergetool: move main program flow into a main() functionDavid Aguilar1-87/+93
2016-10-11mergetool: add copyrightDavid Aguilar1-0/+1
2016-05-03Merge branch 'nf/mergetool-prompt'Junio C Hamano1-1/+1
2016-04-25difftool/mergetool: make the form of yes/no questions consistentNikola Forró1-1/+1
2016-03-10mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar1-1/+10
2016-03-10mergetool: support delete/delete conflictsDavid Aguilar1-3/+11
2015-05-20mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar1-2/+0
2014-11-21mergetool: simplify conditionalsDavid Aguilar1-11/+5
2014-10-21Merge branch 'da/mergetool-temporary-directory'Junio C Hamano1-4/+31
2014-10-21Merge branch 'da/mergetool-tool-help'Junio C Hamano1-1/+8
2014-10-21Merge branch 'da/mergetool-temporary-filename'Junio C Hamano1-5/+11
2014-10-16mergetool: add an option for writing to a temporary directoryDavid Aguilar1-4/+31
2014-10-16mergetool: use more conservative temporary filenamesDavid Aguilar1-5/+11
2014-10-15difftool: don't assume that default sh is saneCharles Bailey1-0/+4
2014-10-15mergetool: don't require a work tree for --tool-helpCharles Bailey1-1/+4
2014-10-15mergetool: use more conservative temporary filenamesDavid Aguilar1-5/+11
2014-06-09git-mergetool.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto1-2/+2
2014-04-22mergetool: run prompt only if guessed toolFelipe Contreras1-3/+11
2013-02-14Merge branch 'al/mergetool-printf-fix'Junio C Hamano1-1/+1
2013-02-08git-mergetool: print filename when it contains %Asheesh Laroia1-1/+1
2013-01-25git-mergetool: move show_tool_help to mergetool--libJohn Keeping1-37/+0
2012-08-23mergetool: style fixesJunio C Hamano1-273/+308
2012-07-23mergetool: support --tool-help option like difftool doesJunio C Hamano1-1/+41
2012-01-23mergetool: Provide an empty file when neededDavid Aguilar1-4/+8
2011-10-10Merge branch 'jm/mergetool-pathspec'Junio C Hamano1-49/+27
2011-09-26mergetool: no longer need to save standard inputJunio C Hamano1-6/+4
2011-09-26mergetool: Use args as pathspec to unmerged filesJonathon Mah1-48/+28
2011-09-19git-mergetool: check return value from readJay Soffian1-1/+1
2011-07-01mergetool: check return value from readJunio C Hamano1-4/+4
2011-04-13mergetool: Teach about submodulesJonathon Mah1-6/+84
2011-02-16mergetool: don't skip modify/remove conflictsMartin von Zweigbergk1-1/+1
2010-09-03Merge branch 'cb/maint-mergetool-no-tty'Junio C Hamano1-2/+6
2010-08-20mergetool: Remove explicit references to /dev/ttyCharles Bailey1-2/+6
2010-08-17mergetool: Skip autoresolved pathsDavid Aguilar1-5/+23
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar1-7/+8
2009-04-11Fix misspelled mergetool.keepBackupFerry Huberts1-1/+1
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar1-211/+13
2009-04-07mergetool: use $( ... ) instead of `backticks`David Aguilar1-8/+8
2009-04-07difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping1-2/+2
2009-04-07git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg1-3/+13
2009-04-07git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg1-2/+8
2009-02-05Merge branch 'cb/mergetool'Junio C Hamano1-4/+11
2009-01-31mergetool: fix running mergetool in sub-directoriesCharles Bailey1-5/+4
2009-01-27mergetool: respect autocrlf by using checkout-indexCharles Bailey1-3/+11
2009-01-27mergetool: Don't repeat merge tool candidatesJohannes Gilger1-10/+8
2009-01-18mergetool: put the cursor on the editable file for VimMarkus Heidelberg1-2/+7
2009-01-01Merge branch 'cb/mergetool'Junio C Hamano1-30/+80
2008-12-19git-mergetool: properly handle "git mergetool -- filename"David Aguilar1-0/+1
2008-12-12mergetool: Don't keep temporary merge files unless told toCharles Bailey1-0/+6
2008-12-12mergetool: Add prompt to continue after failing to merge a fileCharles Bailey1-9/+43
2008-11-14Add -y/--no-prompt option to mergetoolCharles Bailey1-3/+13
2008-11-14Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey1-19/+19
2008-06-19Remove the use of '--' in merge program invocationPatrick Higgins1-12/+12
2008-05-11mergetool: Make ECMerge use the settings as specified by the user in the GUISebastian Schuberth1-2/+2
2008-03-05Teach git mergetool to use custom commands defined at config timeCharles Bailey1-2/+26
2008-03-05Changed an internal variable of mergetool to support custom commandsCharles Bailey1-50/+50
2008-03-05Tidy up git mergetool's backup file behaviourCharles Bailey1-24/+13
2008-01-07Allow git-mergetool to handle paths with a leading spaceRogan Dawes1-2/+5
2007-12-05Open external merge tool with original file extensions for all three filesPini Reznik1-4/+5
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano1-0/+1
2007-10-18mergetool: avoid misleading message "Resetting to default..."Steffen Prohaska1-1/+1
2007-10-18mergetool: add support for ECMergeSteffen Prohaska1-1/+11
2007-10-18mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska1-43/+54
2007-09-28mergetool: Fix typo in options passed to kdiff3Theodore Ts'o1-2/+2
2007-09-28mergetool: fix emerge when running in a subdirectoryTheodore Ts'o1-2/+2
2007-09-28Mergetool generating blank files (1.5.3)Junio C Hamano1-3/+4
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup1-1/+1
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano1-8/+8
2007-06-10git-mergetool: Make default selection of merge-tool more intelligentTheodore Ts'o1-17/+29
2007-06-10[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee1-2/+10
2007-06-06Fix typo in git-mergetoolJosh Triplett1-1/+1
2007-03-29mergetool: Clean up description of files and prompts for merge resolutionsTheodore Ts'o1-12/+15
2007-03-29mergetool: Make git-rm quiet when resolving a deleted file conflictTheodore Ts'o1-1/+1
2007-03-29mergetool: Add support for Apple Mac OS X's opendiff commandTheodore Ts'o1-2/+14
2007-03-29mergetool: Fix abort command when resolving symlinks and deleted filesTheodore Ts'o1-4/+4
2007-03-29mergetool: Remove spurious error message if merge.tool config option not setTheodore Ts'o1-1/+1
2007-03-29mergetool: factor out common codeTheodore Ts'o1-42/+36
2007-03-29mergetool: portability fix: don't use reserved word functionTheodore Ts'o1-5/+5
2007-03-29mergetool: portability fix: don't assume true is in /binTheodore Ts'o1-2/+2
2007-03-29mergetool: Don't error out in the merge case where the local file is deletedTheodore Ts'o1-6/+5
2007-03-29mergetool: Replace use of "echo -n" with printf(1) to be more portableTheodore Ts'o1-14/+12
2007-03-18mergetool: print an appropriate warning if merge.tool is unknownTheodore Ts'o1-4/+9
2007-03-18mergetool: Add support for vimdiff.James Bowes1-3/+5
2007-03-13Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o1-0/+352
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 13:41:09 +0000