Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-mergetool--lib.sh
Age
Commit message (
Expand
)
Author
2022-04-04
vimdiff: add tool documentation
Fernando Ramos
2021-02-18
Merge branch 'sh/mergetool-hideresolved'
Junio C Hamano
2021-02-10
mergetool: add per-tool support and overrides for the hideResolved flag
Seth House
2021-02-10
mergetool: break setup_tool out into separate initialization function
Seth House
2021-01-16
Merge branch 'pb/mergetool-tool-help-fix'
Junio C Hamano
2021-01-07
mergetool--lib: fix '--tool-help' to correctly show available tools
Philippe Blain
2020-11-12
mergetool: avoid letting `list_tool_variants` break user-defined setups
Johannes Schindelin
2020-07-30
mergetools: add support for nvimdiff (neovim) family
pudinha
2020-07-30
mergetool--lib: improve support for vimdiff-style tool variants
pudinha
2019-05-19
Merge branch 'dl/difftool-mergetool'
Junio C Hamano
2019-05-13
mergetool: fallback to tool when guitool unavailable
Denton Liu
2019-05-13
mergetool--lib: create gui_mode function
Denton Liu
2019-05-13
mergetool: use get_merge_tool function
Denton Liu
2019-04-04
mergetools: add support for smerge (Sublime Merge)
David Aguilar
2018-10-25
mergetool: accept -g/--[no-]gui as arguments
Denton Liu
2016-11-29
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
David Aguilar
2016-05-04
Merge branch 'nf/mergetool-prompt'
Junio C Hamano
2016-04-26
difftool/mergetool: make the form of yes/no questions consistent
Nikola Forró
2016-04-04
mergetools: create mergetool_find_win32_cmd() helper function for winmerge
Jacob Nisnevich
2015-06-19
mergetool-lib: fix default tool selection
Michael J Gruber
2015-05-20
mergetool--lib: set IFS for difftool and mergetool
David Aguilar
2014-11-21
mergetool--lib: remove use of $status global
David Aguilar
2014-11-21
mergetool--lib: remove no-op assignment to $status from setup_user_tool
Junio C Hamano
2014-11-18
Merge branch 'da/difftool'
Junio C Hamano
2014-11-15
difftool: honor --trust-exit-code for builtin tools
David Aguilar
2014-10-21
mergetool: rename bc3 to bc
Junio C Hamano
2013-11-27
remove #!interpreter line from shell libraries
Jonathan Nieder
2013-10-15
mergetool--lib: Fix typo in the merge/difftool help
Stefan Saasen
2013-10-14
mergetools/diffmerge: support DiffMerge as a git mergetool
Stefan Saasen
2013-07-29
many small typofixes
Ondřej Bílka
2013-06-18
mergetool--lib: refactor {diff,merge}_cmd logic
John Keeping
2013-02-03
doc: generate a list of valid merge tools
David Aguilar
2013-02-03
mergetool--lib: list user configured tools in '--tool-help'
John Keeping
2013-02-03
mergetool--lib: add functions for finding available tools
David Aguilar
2013-01-30
mergetool--lib: improve the help text in guess_merge_tool()
David Aguilar
2013-01-30
mergetool--lib: simplify command expressions
David Aguilar
2013-01-29
mergetools: simplify how we handle "vim" and "defaults"
David Aguilar
2013-01-28
mergetool--lib: don't call "exit" in setup_tool
John Keeping
2013-01-28
mergetool--lib: improve show_tool_help() output
David Aguilar
2013-01-25
git-mergetool: don't hardcode 'mergetool' in show_tool_help
John Keeping
2013-01-25
git-mergetool: remove redundant assignment
John Keeping
2013-01-25
git-mergetool: move show_tool_help to mergetool--lib
John Keeping
2012-10-01
Merge branch 'da/mergetool-custom'
Junio C Hamano
2012-09-25
mergetool--lib: Allow custom commands to override built-ins
David Aguilar
2012-08-27
Merge branch 'da/difftool-updates'
Junio C Hamano
2012-08-10
Add Code Compare v2.80.4 as a merge / diff tool for Windows
Sebastian Schuberth
2012-07-24
mergetool: support --tool-help option like difftool does
Junio C Hamano
2011-09-20
Merge branch 'maint'
Junio C Hamano
2011-09-20
git-mergetool: check return value from read
Jay Soffian
2011-08-19
mergetool--lib: Refactor tools into separate files
David Aguilar
[next]