aboutsummaryrefslogtreecommitdiffstats
path: root/git-mergetool--lib.sh
AgeCommit message (Expand)AuthorFilesLines
2023-04-05mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks1-0/+40
2022-04-03vimdiff: add tool documentationFernando Ramos1-1/+9
2021-02-17Merge branch 'sh/mergetool-hideresolved'Junio C Hamano1-3/+8
2021-02-09mergetool: add per-tool support and overrides for the hideResolved flagSeth House1-0/+4
2021-02-09mergetool: break setup_tool out into separate initialization functionSeth House1-3/+4
2021-01-15Merge branch 'pb/mergetool-tool-help-fix'Junio C Hamano1-2/+4
2021-01-06mergetool--lib: fix '--tool-help' to correctly show available toolsPhilippe Blain1-2/+4
2020-11-11mergetool: avoid letting `list_tool_variants` break user-defined setupsJohannes Schindelin1-0/+4
2020-07-29mergetools: add support for nvimdiff (neovim) familypudinha1-2/+5
2020-07-29mergetool--lib: improve support for vimdiff-style tool variantspudinha1-5/+23
2019-05-19Merge branch 'dl/difftool-mergetool'Junio C Hamano1-12/+35
2019-05-13mergetool: fallback to tool when guitool unavailableDenton Liu1-9/+26
2019-05-13mergetool--lib: create gui_mode functionDenton Liu1-5/+8
2019-05-13mergetool: use get_merge_tool functionDenton Liu1-1/+4
2019-04-04mergetools: add support for smerge (Sublime Merge)David Aguilar1-0/+1
2018-10-25mergetool: accept -g/--[no-]gui as argumentsDenton Liu1-5/+11
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar1-11/+45
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-04-04mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich1-0/+25
2015-06-19mergetool-lib: fix default tool selectionMichael J Gruber1-0/+1
2015-05-20mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar1-0/+3
2014-11-21mergetool--lib: remove use of $status globalDavid Aguilar1-14/+5
2014-11-21mergetool--lib: remove no-op assignment to $status from setup_user_toolJunio C Hamano1-1/+0
2014-11-18Merge branch 'da/difftool'Junio C Hamano1-0/+1
2014-11-14difftool: honor --trust-exit-code for builtin toolsDavid Aguilar1-0/+1
2014-10-21mergetool: rename bc3 to bcJunio C Hamano1-1/+1
2013-11-26remove #!interpreter line from shell librariesJonathan Nieder1-2/+1
2013-10-14mergetool--lib: Fix typo in the merge/difftool helpStefan Saasen1-1/+1
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen1-1/+2
2013-07-29many small typofixesOndřej Bílka1-1/+1
2013-06-17mergetool--lib: refactor {diff,merge}_cmd logicJohn Keeping1-47/+35
2013-02-02doc: generate a list of valid merge toolsDavid Aguilar1-1/+2
2013-02-02mergetool--lib: list user configured tools in '--tool-help'John Keeping1-1/+40
2013-02-02mergetool--lib: add functions for finding available toolsDavid Aguilar1-36/+65
2013-01-29mergetool--lib: improve the help text in guess_merge_tool()David Aguilar1-1/+7
2013-01-29mergetool--lib: simplify command expressionsDavid Aguilar1-23/+15
2013-01-28mergetools: simplify how we handle "vim" and "defaults"David Aguilar1-30/+31
2013-01-27mergetool--lib: don't call "exit" in setup_toolJohn Keeping1-3/+20
2013-01-27mergetool--lib: improve show_tool_help() outputDavid Aguilar1-5/+21
2013-01-25git-mergetool: don't hardcode 'mergetool' in show_tool_helpJohn Keeping1-2/+4
2013-01-25git-mergetool: remove redundant assignmentJohn Keeping1-1/+0
2013-01-25git-mergetool: move show_tool_help to mergetool--libJohn Keeping1-0/+37
2012-10-01Merge branch 'da/mergetool-custom'Junio C Hamano1-2/+38
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar1-2/+38
2012-08-27Merge branch 'da/difftool-updates'Junio C Hamano1-1/+1
2012-08-10Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth1-1/+1
2012-07-23mergetool: support --tool-help option like difftool doesJunio C Hamano1-1/+5
2011-09-19Merge branch 'maint'Junio C Hamano1-1/+1
2011-09-19git-mergetool: check return value from readJay Soffian1-1/+1
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar1-333/+52
2011-08-19mergetool--lib: Make style consistent with gitDavid Aguilar1-53/+100
2011-08-05misc-sh: fix up whitespace in some other .sh files.Jon Seymour1-3/+3
2011-06-29Merge branch 'da/git-prefix-everywhere' into nextJunio C Hamano1-0/+7
2011-05-26git-mergetool--lib: Make vimdiff retain the current directoryDavid Aguilar1-0/+7
2011-05-01Pass empty file to p4merge where no base is suitable.Ciaran Jessup1-6/+3
2011-03-19Merge branch 'ss/mergetool--lib'Junio C Hamano1-104/+121
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth1-2/+20
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth1-110/+109
2011-02-25mergetool-lib: call vim in readonly mode for diffsMichael J Gruber1-2/+2
2010-09-29mergetool-lib: make the three-way diff the default for vim/gvimDan McGee1-3/+15
2010-09-15mergetool-lib: add a three-way diff view for vim/gvimDan McGee1-2/+7
2010-09-15mergetool-lib: combine vimdiff and gvimdiff run blocksDan McGee1-14/+3
2010-08-20mergetool: Remove explicit references to /dev/ttyCharles Bailey1-1/+1
2010-01-29add shebang line to git-mergetool--lib.shJeff King1-0/+1
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano1-7/+6
2009-11-23mergetool--lib: simplify guess_merge_tool()René Scharfe1-7/+6
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon1-2/+15
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar1-2/+23
2009-05-09mergetool--lib: specialize diff options for emerge and ecmergeDavid Aguilar1-3/+3
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar1-51/+58
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar1-0/+378
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 12:37:36 +0000