Google Git
Sign in
googlers / jrn / git / b7de153bd9332a992baa6f937372f0b1833f61e5 / git-mergetool--lib.sh
  1. 78a26cb Merge branch 'sh/mergetool-hideresolved' by Junio C Hamano · 4 years, 1 month ago
  2. 9d9cf23 mergetool: add per-tool support and overrides for the hideResolved flag by Seth House · 4 years, 1 month ago
  3. de8dafb mergetool: break setup_tool out into separate initialization function by Seth House · 4 years, 1 month ago
  4. 073552d Merge branch 'pb/mergetool-tool-help-fix' by Junio C Hamano · 4 years, 2 months ago
  5. 80f5a16 mergetool--lib: fix '--tool-help' to correctly show available tools by Philippe Blain · 4 years, 2 months ago
  6. 12026f4 mergetool: avoid letting `list_tool_variants` break user-defined setups by Johannes Schindelin · 4 years, 4 months ago
  7. 1186897 mergetools: add support for nvimdiff (neovim) family by pudinha · 4 years, 7 months ago
  8. 83bbf9b mergetool--lib: improve support for vimdiff-style tool variants by pudinha · 4 years, 7 months ago
  9. 85ac27e Merge branch 'dl/difftool-mergetool' by Junio C Hamano · 6 years ago
  10. 60aced3 mergetool: fallback to tool when guitool unavailable by Denton Liu · 6 years ago
  11. 884630b mergetool--lib: create gui_mode function by Denton Liu · 6 years ago
  12. 05fb872 mergetool: use get_merge_tool function by Denton Liu · 6 years ago
  13. eb12adc mergetools: add support for smerge (Sublime Merge) by David Aguilar · 6 years ago
  14. 063f2bd mergetool: accept -g/--[no-]gui as arguments by Denton Liu · 6 years ago
  15. 7c10605 mergetool: honor mergetool.$tool.trustExitCode for built-in tools by David Aguilar · 8 years ago
  16. b974143 Merge branch 'nf/mergetool-prompt' by Junio C Hamano · 9 years ago
  17. cce076e difftool/mergetool: make the form of yes/no questions consistent by Nikola Forró · 9 years ago
  18. e36d716 mergetools: create mergetool_find_win32_cmd() helper function for winmerge by Jacob Nisnevich · 9 years ago
  19. f67986b mergetool-lib: fix default tool selection by Michael J Gruber · 10 years ago
  20. 719518f mergetool--lib: set IFS for difftool and mergetool by David Aguilar · 10 years ago
  21. 1b6a534 mergetool--lib: remove use of $status global by David Aguilar · 10 years ago
  22. e00e13e mergetool--lib: remove no-op assignment to $status from setup_user_tool by Junio C Hamano · 10 years ago
  23. 3f78278 Merge branch 'da/difftool' by Junio C Hamano · 10 years ago
  24. 99474b6 difftool: honor --trust-exit-code for builtin tools by David Aguilar · 10 years ago
  25. f13f9b0 mergetool: rename bc3 to bc by Junio C Hamano · 10 years ago
  26. 11d6214 remove #!interpreter line from shell libraries by Jonathan Nieder · 11 years ago
  27. 2b7ca91 mergetool--lib: Fix typo in the merge/difftool help by Stefan Saasen · 11 years ago
  28. c5f424f mergetools/diffmerge: support DiffMerge as a git mergetool by Stefan Saasen · 11 years ago
  29. 98e023d many small typofixes by Ondřej Bílka · 12 years ago
  30. d2512fc mergetool--lib: refactor {diff,merge}_cmd logic by John Keeping · 12 years ago
  31. f35ec54 doc: generate a list of valid merge tools by David Aguilar · 12 years ago
  32. 665682c mergetool--lib: list user configured tools in '--tool-help' by John Keeping · 12 years ago
  33. 17a1f1c mergetool--lib: add functions for finding available tools by David Aguilar · 12 years ago
  34. 5338a6a mergetool--lib: improve the help text in guess_merge_tool() by David Aguilar · 12 years ago
  35. 80ff2b6 mergetool--lib: simplify command expressions by David Aguilar · 12 years ago
  36. 073678b mergetools: simplify how we handle "vim" and "defaults" by David Aguilar · 12 years ago
  37. 62957be mergetool--lib: don't call "exit" in setup_tool by John Keeping · 12 years ago
  38. 88d3406 mergetool--lib: improve show_tool_help() output by David Aguilar · 12 years ago
  39. 62b6f7e git-mergetool: don't hardcode 'mergetool' in show_tool_help by John Keeping · 12 years ago
  40. 26daa84 git-mergetool: remove redundant assignment by John Keeping · 12 years ago
  41. 4a8273a git-mergetool: move show_tool_help to mergetool--lib by John Keeping · 12 years ago
  42. 5ec11ab Merge branch 'da/mergetool-custom' by Junio C Hamano · 12 years ago
  43. a427ef7 mergetool--lib: Allow custom commands to override built-ins by David Aguilar · 12 years ago
  44. de54ef2 Merge branch 'da/difftool-updates' by Junio C Hamano · 13 years ago
  45. 755e8b3 Add Code Compare v2.80.4 as a merge / diff tool for Windows by Sebastian Schuberth · 13 years ago
  46. 109859e mergetool: support --tool-help option like difftool does by Junio C Hamano · 13 years ago
  47. 5ec8217 Merge branch 'maint' by Junio C Hamano · 13 years ago
  48. e622f41 git-mergetool: check return value from read by Jay Soffian · 13 years ago
  49. bc7a96a mergetool--lib: Refactor tools into separate files by David Aguilar · 14 years ago
  50. 240dc3e mergetool--lib: Make style consistent with git by David Aguilar · 14 years ago
  51. 285c6cb misc-sh: fix up whitespace in some other .sh files. by Jon Seymour · 14 years ago
  52. 4ed5461 Merge branch 'da/git-prefix-everywhere' into next by Junio C Hamano · 14 years ago
  53. f9ad901 git-mergetool--lib: Make vimdiff retain the current directory by David Aguilar · 14 years ago
  54. 0a0ec7b Pass empty file to p4merge where no base is suitable. by Ciaran Jessup · 14 years ago
  55. 9d59e66 Merge branch 'ss/mergetool--lib' by Junio C Hamano · 14 years ago
  56. ffe6dc0 mergetool--lib: Add Beyond Compare 3 as a tool by Sebastian Schuberth · 14 years ago
  57. aa03f60 mergetool--lib: Sort tools alphabetically for easier lookup by Sebastian Schuberth · 14 years ago
  58. 853c0ff mergetool-lib: call vim in readonly mode for diffs by Michael J Gruber · 14 years ago
  59. 0008669 mergetool-lib: make the three-way diff the default for vim/gvim by Dan McGee · 14 years ago
  60. 829ef38 mergetool-lib: add a three-way diff view for vim/gvim by Dan McGee · 14 years ago
  61. ae69fd0 mergetool-lib: combine vimdiff and gvimdiff run blocks by Dan McGee · 14 years ago
  62. af31471 mergetool: Remove explicit references to /dev/tty by Charles Bailey · 15 years ago
  63. 02e5124 add shebang line to git-mergetool--lib.sh by Jeff King · 15 years ago
  64. ad7ace7 Merge branch 'rs/work-around-grep-opt-insanity' by Junio C Hamano · 15 years ago
  65. 7b10422 mergetool--lib: simplify guess_merge_tool() by René Scharfe · 15 years ago
  66. c8998b4 mergetool--lib: add p4merge as a pre-configured mergetool option by Scott Chacon · 15 years ago
  67. b6f0621 mergetool--lib: add support for araxis merge by David Aguilar · 16 years ago
  68. 4481ff0 mergetool--lib: specialize diff options for emerge and ecmerge by David Aguilar · 16 years ago
  69. 47d6592 mergetool--lib: simplify API usage by removing more global variables by David Aguilar · 16 years ago
  70. 21d0ba7 difftool/mergetool: refactor commands to use git-mergetool--lib by David Aguilar · 16 years ago