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