Google Git
Sign in
googlers / jrn / git / e869c5eaeeef0c264abb9d98b097a4765d44876b / git-mergetool.sh
  1. 98a2602 mergetool: simplify conditionals by David Aguilar · 10 years ago
  2. a46af59 Merge branch 'da/mergetool-temporary-directory' by Junio C Hamano · 10 years ago
  3. e96e98b Merge branch 'da/mergetool-tool-help' by Junio C Hamano · 10 years ago
  4. 02f4db8 Merge branch 'da/mergetool-temporary-filename' by Junio C Hamano · 10 years ago
  5. 8f0cb41 mergetool: add an option for writing to a temporary directory by David Aguilar · 10 years ago
  6. eab335c mergetool: use more conservative temporary filenames by David Aguilar · 10 years ago
  7. 4fb4b02 difftool: don't assume that default sh is sane by Charles Bailey · 10 years ago
  8. 7bfb7c3 mergetool: don't require a work tree for --tool-help by Charles Bailey · 10 years ago
  9. 9c66cd3 mergetool: use more conservative temporary filenames by David Aguilar · 10 years ago
  10. 1cb4937 git-mergetool.sh: avoid "test <cond> -a/-o <cond>" by Elia Pinto · 11 years ago
  11. 4ecc63d mergetool: run prompt only if guessed tool by Felipe Contreras · 11 years ago
  12. ba56d70 Merge branch 'al/mergetool-printf-fix' by Junio C Hamano · 12 years ago
  13. 59cf706 git-mergetool: print filename when it contains % by Asheesh Laroia · 12 years ago
  14. 4a8273a git-mergetool: move show_tool_help to mergetool--lib by John Keeping · 12 years ago
  15. f8750a0 mergetool: style fixes by Junio C Hamano · 13 years ago
  16. 109859e mergetool: support --tool-help option like difftool does by Junio C Hamano · 13 years ago
  17. ec245ba mergetool: Provide an empty file when needed by David Aguilar · 13 years ago
  18. 5fbdb9c Merge branch 'jm/mergetool-pathspec' by Junio C Hamano · 13 years ago
  19. 6d9990a mergetool: no longer need to save standard input by Junio C Hamano · 13 years ago
  20. 3e8e691 mergetool: Use args as pathspec to unmerged files by Jonathon Mah · 13 years ago
  21. e622f41 git-mergetool: check return value from read by Jay Soffian · 13 years ago
  22. 6b44577 mergetool: check return value from read by Junio C Hamano · 14 years ago
  23. ff7f089 mergetool: Teach about submodules by Jonathon Mah · 14 years ago
  24. 2f59c94 mergetool: don't skip modify/remove conflicts by Martin von Zweigbergk · 14 years ago
  25. 1998f4c Merge branch 'cb/maint-mergetool-no-tty' by Junio C Hamano · 15 years ago
  26. af31471 mergetool: Remove explicit references to /dev/tty by Charles Bailey · 15 years ago
  27. bb0a484 mergetool: Skip autoresolved paths by David Aguilar · 15 years ago
  28. 47d6592 mergetool--lib: simplify API usage by removing more global variables by David Aguilar · 16 years ago
  29. 70af4e9 Fix misspelled mergetool.keepBackup by Ferry Huberts · 16 years ago
  30. 21d0ba7 difftool/mergetool: refactor commands to use git-mergetool--lib by David Aguilar · 16 years ago
  31. 9a62d72 mergetool: use $( ... ) instead of `backticks` by David Aguilar · 16 years ago
  32. 1c0f3d2 difftool/mergetool: add diffuse as merge and diff tool by Sebastian Pipping · 16 years ago
  33. b98c212 git-mergetool: add new merge tool TortoiseMerge by Markus Heidelberg · 16 years ago
  34. bad4273 git-mergetool/difftool: make (g)vimdiff workable under Windows by Markus Heidelberg · 16 years ago
  35. b371922 Merge branch 'cb/mergetool' by Junio C Hamano · 16 years ago
  36. ff4a185 mergetool: fix running mergetool in sub-directories by Charles Bailey · 16 years ago
  37. 0ec7b6c mergetool: respect autocrlf by using checkout-index by Charles Bailey · 16 years ago
  38. fb700cb mergetool: Don't repeat merge tool candidates by Johannes Gilger · 16 years ago
  39. 71ee483 mergetool: put the cursor on the editable file for Vim by Markus Heidelberg · 16 years ago
  40. 3827210 Merge branch 'cb/mergetool' by Junio C Hamano · 16 years ago
  41. ce2c3eb git-mergetool: properly handle "git mergetool -- filename" by David Aguilar · 16 years ago
  42. 162eba8 mergetool: Don't keep temporary merge files unless told to by Charles Bailey · 16 years ago
  43. b0169d8 mergetool: Add prompt to continue after failing to merge a file by Charles Bailey · 16 years ago
  44. 682b451 Add -y/--no-prompt option to mergetool by Charles Bailey · 16 years ago
  45. 0eea345 Fix some tab/space inconsistencies in git-mergetool.sh by Charles Bailey · 16 years ago
  46. 641dba4 Remove the use of '--' in merge program invocation by Patrick Higgins · 17 years ago
  47. f4e9f78 mergetool: Make ECMerge use the settings as specified by the user in the GUI by Sebastian Schuberth · 17 years ago
  48. 964473a Teach git mergetool to use custom commands defined at config time by Charles Bailey · 17 years ago
  49. b3ea27e Changed an internal variable of mergetool to support custom commands by Charles Bailey · 17 years ago
  50. 44c36d1 Tidy up git mergetool's backup file behaviour by Charles Bailey · 17 years ago
  51. 2e8fd78 Allow git-mergetool to handle paths with a leading space by Rogan Dawes · 17 years ago
  52. c3d51cd Open external merge tool with original file extensions for all three files by Pini Reznik · 17 years ago
  53. 8f321a3 scripts: Add placeholders for OPTIONS_SPEC by Junio C Hamano · 17 years ago
  54. d279fc1 mergetool: avoid misleading message "Resetting to default..." by Steffen Prohaska · 17 years ago
  55. ca8e6b7 mergetool: add support for ECMerge by Steffen Prohaska · 17 years ago
  56. e3fa2c7 mergetool: use path to mergetool in config var mergetool.<tool>.path by Steffen Prohaska · 17 years ago
  57. 208fe3a mergetool: Fix typo in options passed to kdiff3 by Theodore Ts'o · 17 years ago
  58. f6e0e55 mergetool: fix emerge when running in a subdirectory by Theodore Ts'o · 17 years ago
  59. 769f398 Mergetool generating blank files (1.5.3) by Junio C Hamano · 17 years ago
  60. 822f7c7 Supplant the "while case ... break ;; esac" idiom by David Kastrup · 17 years ago
  61. 5be6007 Rewrite "git-frotz" to "git frotz" by Junio C Hamano · 18 years ago
  62. 301ac38 git-mergetool: Make default selection of merge-tool more intelligent by Theodore Ts'o · 18 years ago
  63. 730b5b4 [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool by Dan McGee · 18 years ago
  64. 2571ac6 Fix typo in git-mergetool by Josh Triplett · 18 years ago
  65. 27090aa mergetool: Clean up description of files and prompts for merge resolutions by Theodore Ts'o · 18 years ago
  66. 1346c99 mergetool: Make git-rm quiet when resolving a deleted file conflict by Theodore Ts'o · 18 years ago
  67. 365cf97 mergetool: Add support for Apple Mac OS X's opendiff command by Theodore Ts'o · 18 years ago
  68. 5a174f1 mergetool: Fix abort command when resolving symlinks and deleted files by Theodore Ts'o · 18 years ago
  69. b7b36f9 mergetool: Remove spurious error message if merge.tool config option not set by Theodore Ts'o · 18 years ago
  70. ddc0c49 mergetool: factor out common code by Theodore Ts'o · 18 years ago
  71. 262c981 mergetool: portability fix: don't use reserved word function by Theodore Ts'o · 18 years ago
  72. d1dc695 mergetool: portability fix: don't assume true is in /bin by Theodore Ts'o · 18 years ago
  73. ce5b6d7 mergetool: Don't error out in the merge case where the local file is deleted by Theodore Ts'o · 18 years ago
  74. 20fa04e mergetool: Replace use of "echo -n" with printf(1) to be more portable by Theodore Ts'o · 18 years ago
  75. d6678c2 mergetool: print an appropriate warning if merge.tool is unknown by Theodore Ts'o · 18 years ago
  76. 9cec653 mergetool: Add support for vimdiff. by James Bowes · 18 years ago
  77. c4b4a5a Add git-mergetool to run an appropriate merge conflict resolution program by Theodore Ts'o · 18 years ago