summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
AgeCommit message (Expand)AuthorFilesLines
2021-02-17Merge branch 'sh/mergetool-hideresolved'Libravatar Junio C Hamano1-3/+8
2021-02-09mergetool: add per-tool support and overrides for the hideResolved flagLibravatar Seth House1-0/+4
2021-02-09mergetool: break setup_tool out into separate initialization functionLibravatar Seth House1-3/+4
2021-01-15Merge branch 'pb/mergetool-tool-help-fix'Libravatar Junio C Hamano1-2/+4
2021-01-06mergetool--lib: fix '--tool-help' to correctly show available toolsLibravatar Philippe Blain1-2/+4
2020-11-11mergetool: avoid letting `list_tool_variants` break user-defined setupsLibravatar Johannes Schindelin1-0/+4
2020-07-29mergetools: add support for nvimdiff (neovim) familyLibravatar pudinha1-2/+5
2020-07-29mergetool--lib: improve support for vimdiff-style tool variantsLibravatar pudinha1-5/+23
2019-05-19Merge branch 'dl/difftool-mergetool'Libravatar Junio C Hamano1-12/+35
2019-05-13mergetool: fallback to tool when guitool unavailableLibravatar Denton Liu1-9/+26
2019-05-13mergetool--lib: create gui_mode functionLibravatar Denton Liu1-5/+8
2019-05-13mergetool: use get_merge_tool functionLibravatar Denton Liu1-1/+4
2019-04-04mergetools: add support for smerge (Sublime Merge)Libravatar David Aguilar1-0/+1
2018-10-25mergetool: accept -g/--[no-]gui as argumentsLibravatar Denton Liu1-5/+11
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsLibravatar David Aguilar1-11/+45
2016-05-03Merge branch 'nf/mergetool-prompt'Libravatar Junio C Hamano1-1/+1
2016-04-25difftool/mergetool: make the form of yes/no questions consistentLibravatar Nikola Forró1-1/+1
2016-04-04mergetools: create mergetool_find_win32_cmd() helper function for winmergeLibravatar Jacob Nisnevich1-0/+25
2015-06-19mergetool-lib: fix default tool selectionLibravatar Michael J Gruber1-0/+1
2015-05-20mergetool--lib: set IFS for difftool and mergetoolLibravatar David Aguilar1-0/+3
2014-11-21mergetool--lib: remove use of $status globalLibravatar David Aguilar1-14/+5
2014-11-21mergetool--lib: remove no-op assignment to $status from setup_user_toolLibravatar Junio C Hamano1-1/+0
2014-11-18Merge branch 'da/difftool'Libravatar Junio C Hamano1-0/+1
2014-11-14difftool: honor --trust-exit-code for builtin toolsLibravatar David Aguilar1-0/+1
2014-10-21mergetool: rename bc3 to bcLibravatar Junio C Hamano1-1/+1
2013-11-26remove #!interpreter line from shell librariesLibravatar Jonathan Nieder1-2/+1
2013-10-14mergetool--lib: Fix typo in the merge/difftool helpLibravatar Stefan Saasen1-1/+1
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolLibravatar Stefan Saasen1-1/+2
2013-07-29many small typofixesLibravatar Ondřej Bílka1-1/+1
2013-06-17mergetool--lib: refactor {diff,merge}_cmd logicLibravatar John Keeping1-47/+35
2013-02-02doc: generate a list of valid merge toolsLibravatar David Aguilar1-1/+2
2013-02-02mergetool--lib: list user configured tools in '--tool-help'Libravatar John Keeping1-1/+40
2013-02-02mergetool--lib: add functions for finding available toolsLibravatar David Aguilar1-36/+65
2013-01-29mergetool--lib: improve the help text in guess_merge_tool()Libravatar David Aguilar1-1/+7
2013-01-29mergetool--lib: simplify command expressionsLibravatar David Aguilar1-23/+15
2013-01-28mergetools: simplify how we handle "vim" and "defaults"Libravatar David Aguilar1-30/+31
2013-01-27mergetool--lib: don't call "exit" in setup_toolLibravatar John Keeping1-3/+20
2013-01-27mergetool--lib: improve show_tool_help() outputLibravatar David Aguilar1-5/+21
2013-01-25git-mergetool: don't hardcode 'mergetool' in show_tool_helpLibravatar John Keeping1-2/+4
2013-01-25git-mergetool: remove redundant assignmentLibravatar John Keeping1-1/+0
2013-01-25git-mergetool: move show_tool_help to mergetool--libLibravatar John Keeping1-0/+37
2012-10-01Merge branch 'da/mergetool-custom'Libravatar Junio C Hamano1-2/+38
2012-09-25mergetool--lib: Allow custom commands to override built-insLibravatar David Aguilar1-2/+38
2012-08-27Merge branch 'da/difftool-updates'Libravatar Junio C Hamano1-1/+1
2012-08-10Add Code Compare v2.80.4 as a merge / diff tool for WindowsLibravatar Sebastian Schuberth1-1/+1
2012-07-23mergetool: support --tool-help option like difftool doesLibravatar Junio C Hamano1-1/+5
2011-09-19Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2011-09-19git-mergetool: check return value from readLibravatar Jay Soffian1-1/+1
2011-08-19mergetool--lib: Refactor tools into separate filesLibravatar David Aguilar1-333/+52
2011-08-19mergetool--lib: Make style consistent with gitLibravatar David Aguilar1-53/+100
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 08:58:23 +0000