Google Git
Sign in
googlers / jrn / git / 3efe5d1d32fde899b23ebbb1fde499a0897e1c4e / git-mergetool--lib.sh
  1. 109859e mergetool: support --tool-help option like difftool does by Junio C Hamano · 13 years ago
  2. 5ec8217 Merge branch 'maint' by Junio C Hamano · 13 years ago
  3. e622f41 git-mergetool: check return value from read by Jay Soffian · 13 years ago
  4. bc7a96a mergetool--lib: Refactor tools into separate files by David Aguilar · 14 years ago
  5. 240dc3e mergetool--lib: Make style consistent with git by David Aguilar · 14 years ago
  6. 285c6cb misc-sh: fix up whitespace in some other .sh files. by Jon Seymour · 14 years ago
  7. 4ed5461 Merge branch 'da/git-prefix-everywhere' into next by Junio C Hamano · 14 years ago
  8. f9ad901 git-mergetool--lib: Make vimdiff retain the current directory by David Aguilar · 14 years ago
  9. 0a0ec7b Pass empty file to p4merge where no base is suitable. by Ciaran Jessup · 14 years ago
  10. 9d59e66 Merge branch 'ss/mergetool--lib' by Junio C Hamano · 14 years ago
  11. ffe6dc0 mergetool--lib: Add Beyond Compare 3 as a tool by Sebastian Schuberth · 14 years ago
  12. aa03f60 mergetool--lib: Sort tools alphabetically for easier lookup by Sebastian Schuberth · 14 years ago
  13. 853c0ff mergetool-lib: call vim in readonly mode for diffs by Michael J Gruber · 14 years ago
  14. 0008669 mergetool-lib: make the three-way diff the default for vim/gvim by Dan McGee · 14 years ago
  15. 829ef38 mergetool-lib: add a three-way diff view for vim/gvim by Dan McGee · 14 years ago
  16. ae69fd0 mergetool-lib: combine vimdiff and gvimdiff run blocks by Dan McGee · 14 years ago
  17. af31471 mergetool: Remove explicit references to /dev/tty by Charles Bailey · 15 years ago
  18. 02e5124 add shebang line to git-mergetool--lib.sh by Jeff King · 15 years ago
  19. ad7ace7 Merge branch 'rs/work-around-grep-opt-insanity' by Junio C Hamano · 15 years ago
  20. 7b10422 mergetool--lib: simplify guess_merge_tool() by René Scharfe · 15 years ago
  21. c8998b4 mergetool--lib: add p4merge as a pre-configured mergetool option by Scott Chacon · 15 years ago
  22. b6f0621 mergetool--lib: add support for araxis merge by David Aguilar · 16 years ago
  23. 4481ff0 mergetool--lib: specialize diff options for emerge and ecmerge by David Aguilar · 16 years ago
  24. 47d6592 mergetool--lib: simplify API usage by removing more global variables by David Aguilar · 16 years ago
  25. 21d0ba7 difftool/mergetool: refactor commands to use git-mergetool--lib by David Aguilar · 16 years ago