path: root/
AgeCommit message (Expand)Author
2021-02-18Merge branch 'sh/mergetool-hideresolved'Junio C Hamano
2021-02-09mergetool: add per-tool support and overrides for the hideResolved flagSeth House
2021-02-09mergetool: break setup_tool out into separate initialization functionSeth House
2021-01-16Merge branch 'pb/mergetool-tool-help-fix'Junio C Hamano
2021-01-07mergetool--lib: fix '--tool-help' to correctly show available toolsPhilippe Blain
2020-11-11mergetool: avoid letting `list_tool_variants` break user-defined setupsJohannes Schindelin
2020-07-29mergetools: add support for nvimdiff (neovim) familypudinha
2020-07-29mergetool--lib: improve support for vimdiff-style tool variantspudinha
2019-05-19Merge branch 'dl/difftool-mergetool'Junio C Hamano
2019-05-13mergetool: fallback to tool when guitool unavailableDenton Liu
2019-05-13mergetool--lib: create gui_mode functionDenton Liu
2019-05-13mergetool: use get_merge_tool functionDenton Liu
2019-04-04mergetools: add support for smerge (Sublime Merge)David Aguilar
2018-10-25mergetool: accept -g/--[no-]gui as argumentsDenton Liu
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar
2016-05-03Merge branch 'nf/mergetool-prompt'Junio C Hamano
2016-04-25difftool/mergetool: make the form of yes/no questions consistentNikola Forró
2016-04-04mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich
2015-06-19mergetool-lib: fix default tool selectionMichael J Gruber
2015-05-20mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar
2014-11-21mergetool--lib: remove use of $status globalDavid Aguilar
2014-11-21mergetool--lib: remove no-op assignment to $status from setup_user_toolJunio C Hamano
2014-11-18Merge branch 'da/difftool'Junio C Hamano
2014-11-14difftool: honor --trust-exit-code for builtin toolsDavid Aguilar
2014-10-21mergetool: rename bc3 to bcJunio C Hamano
2013-11-26remove #!interpreter line from shell librariesJonathan Nieder
2013-10-14mergetool--lib: Fix typo in the merge/difftool helpStefan Saasen
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen
2013-07-29many small typofixesOndřej Bílka
2013-06-17mergetool--lib: refactor {diff,merge}_cmd logicJohn Keeping
2013-02-03doc: generate a list of valid merge toolsDavid Aguilar
2013-02-03mergetool--lib: list user configured tools in '--tool-help'John Keeping
2013-02-03mergetool--lib: add functions for finding available toolsDavid Aguilar
2013-01-29mergetool--lib: improve the help text in guess_merge_tool()David Aguilar
2013-01-29mergetool--lib: simplify command expressionsDavid Aguilar
2013-01-29mergetools: simplify how we handle "vim" and "defaults"David Aguilar
2013-01-28mergetool--lib: don't call "exit" in setup_toolJohn Keeping
2013-01-28mergetool--lib: improve show_tool_help() outputDavid Aguilar
2013-01-25git-mergetool: don't hardcode 'mergetool' in show_tool_helpJohn Keeping
2013-01-25git-mergetool: remove redundant assignmentJohn Keeping
2013-01-25git-mergetool: move show_tool_help to mergetool--libJohn Keeping
2012-10-01Merge branch 'da/mergetool-custom'Junio C Hamano
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar
2012-08-27Merge branch 'da/difftool-updates'Junio C Hamano
2012-08-10Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth
2012-07-23mergetool: support --tool-help option like difftool doesJunio C Hamano
2011-09-20Merge branch 'maint'Junio C Hamano
2011-09-20git-mergetool: check return value from readJay Soffian
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar
2011-08-19mergetool--lib: Make style consistent with gitDavid Aguilar