summaryrefslogtreecommitdiffstats
path: root/git-mergetool--lib.sh
AgeCommit message (Expand)AuthorLines
2024-11-25git-mergetool--lib.sh: add error message for unknown tool variantPhilippe Blain-0/+1
2024-11-25git-mergetool--lib.sh: add error message if 'setup_user_tool' failsPhilippe Blain-2/+7
2024-11-25git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown toolPhilippe Blain-1/+1
2023-04-05mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks-0/+40
2022-04-03vimdiff: add tool documentationFernando Ramos-1/+9
2021-02-17Merge branch 'sh/mergetool-hideresolved'Junio C Hamano-3/+8
2021-02-09mergetool: add per-tool support and overrides for the hideResolved flagSeth House-0/+4
2021-02-09mergetool: break setup_tool out into separate initialization functionSeth House-3/+4
2021-01-15Merge branch 'pb/mergetool-tool-help-fix'Junio C Hamano-2/+4
2021-01-06mergetool--lib: fix '--tool-help' to correctly show available toolsPhilippe Blain-2/+4
2020-11-11mergetool: avoid letting `list_tool_variants` break user-defined setupsJohannes Schindelin-0/+4
2020-07-29mergetools: add support for nvimdiff (neovim) familypudinha-2/+5
2020-07-29mergetool--lib: improve support for vimdiff-style tool variantspudinha-5/+23
2019-05-19Merge branch 'dl/difftool-mergetool'Junio C Hamano-12/+35
2019-05-13mergetool: fallback to tool when guitool unavailableDenton Liu-9/+26
2019-05-13mergetool--lib: create gui_mode functionDenton Liu-5/+8
2019-05-13mergetool: use get_merge_tool functionDenton Liu-1/+4
2019-04-04mergetools: add support for smerge (Sublime Merge)David Aguilar-0/+1
2018-10-25mergetool: accept -g/--[no-]gui as argumentsDenton Liu-5/+11
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar-11/+45
2016-05-03Merge branch 'nf/mergetool-prompt'Junio C Hamano-1/+1
2016-04-25difftool/mergetool: make the form of yes/no questions consistentNikola Forró-1/+1
2016-04-04mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich-0/+25
2015-06-19mergetool-lib: fix default tool selectionMichael J Gruber-0/+1
2015-05-20mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar-0/+3
2014-11-21mergetool--lib: remove use of $status globalDavid Aguilar-14/+5
2014-11-21mergetool--lib: remove no-op assignment to $status from setup_user_toolJunio C Hamano-1/+0
2014-11-18Merge branch 'da/difftool'Junio C Hamano-0/+1
2014-11-14difftool: honor --trust-exit-code for builtin toolsDavid Aguilar-0/+1
2014-10-21mergetool: rename bc3 to bcJunio C Hamano-1/+1
2013-11-26remove #!interpreter line from shell librariesJonathan Nieder-2/+1
2013-10-14mergetool--lib: Fix typo in the merge/difftool helpStefan Saasen-1/+1
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen-1/+2
2013-07-29many small typofixesOndřej Bílka-1/+1
2013-06-17mergetool--lib: refactor {diff,merge}_cmd logicJohn Keeping-47/+35
2013-02-02doc: generate a list of valid merge toolsDavid Aguilar-1/+2
2013-02-02mergetool--lib: list user configured tools in '--tool-help'John Keeping-1/+40
2013-02-02mergetool--lib: add functions for finding available toolsDavid Aguilar-36/+65
2013-01-29mergetool--lib: improve the help text in guess_merge_tool()David Aguilar-1/+7
2013-01-29mergetool--lib: simplify command expressionsDavid Aguilar-23/+15
2013-01-28mergetools: simplify how we handle "vim" and "defaults"David Aguilar-30/+31
2013-01-27mergetool--lib: don't call "exit" in setup_toolJohn Keeping-3/+20
2013-01-27mergetool--lib: improve show_tool_help() outputDavid Aguilar-5/+21
2013-01-25git-mergetool: don't hardcode 'mergetool' in show_tool_helpJohn Keeping-2/+4
2013-01-25git-mergetool: remove redundant assignmentJohn Keeping-1/+0
2013-01-25git-mergetool: move show_tool_help to mergetool--libJohn Keeping-0/+37
2012-10-01Merge branch 'da/mergetool-custom'Junio C Hamano-2/+38
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar-2/+38
2012-08-27Merge branch 'da/difftool-updates'Junio C Hamano-1/+1
2012-08-10Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth-1/+1
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-24 14:36:16 +0000