Google Git
Sign in
googlers / jrn / git / 93f0d33818e94464a581209b4a102dac59db202a / Documentation / git-mergetool.txt
  1. 7791a1d Documentation: use [verse] for SYNOPSIS sections by Martin von Zweigbergk · 14 years ago
  2. 9d59e66 Merge branch 'ss/mergetool--lib' by Junio C Hamano · 14 years ago
  3. 48bb914 doc: drop author/documentation sections from most pages by Jeff King · 14 years ago
  4. ffe6dc0 mergetool--lib: Add Beyond Compare 3 as a tool by Sebastian Schuberth · 14 years ago
  5. aa03f60 mergetool--lib: Sort tools alphabetically for easier lookup by Sebastian Schuberth · 14 years ago
  6. 0adda93 Use parentheses and `...' where appropriate by Štěpán Němec · 14 years ago
  7. d1cc462 Documentation: Explain git-mergetool's use of temporary files by David Aguilar · 15 years ago
  8. 0b444cd Documentation: spell 'git cmd' without dash throughout by Thomas Rast · 15 years ago
  9. c8998b4 mergetool--lib: add p4merge as a pre-configured mergetool option by Scott Chacon · 15 years ago
  10. b6f0621 mergetool--lib: add support for araxis merge by David Aguilar · 16 years ago
  11. 1c0f3d2 difftool/mergetool: add diffuse as merge and diff tool by Sebastian Pipping · 16 years ago
  12. b98c212 git-mergetool: add new merge tool TortoiseMerge by Markus Heidelberg · 16 years ago
  13. 6b89d06 Documentation: let asciidoc align related options by Markus Heidelberg · 16 years ago
  14. 3827210 Merge branch 'cb/mergetool' by Junio C Hamano · 16 years ago
  15. 29b802a Improve language in git-merge.txt and related docs by Ralf Wildenhues · 16 years ago
  16. 682b451 Add -y/--no-prompt option to mergetool by Charles Bailey · 16 years ago
  17. 1168d40 Documentation: typos / spelling fixes by Mike Ralphson · 17 years ago
  18. ba020ef manpages: italicize git command names (which were in teletype font) by Jonathan Nieder · 17 years ago
  19. 483bc4f Documentation formatting and cleanup by Jonathan Nieder · 17 years ago
  20. b1889c3 Documentation: be consistent about "git-" versus "git " by Jonathan Nieder · 17 years ago
  21. 9e1f0a8 documentation: move git(7) to git(1) by Christian Couder · 17 years ago
  22. caa9982 merge-tool documentation: describe custom command usage by Charles Bailey · 17 years ago
  23. bbdfbc4 git-mergetool documentaiton: show toolnames in typewriter font by Charles Bailey · 17 years ago
  24. 5162e69 Documentation: rename gitlink macro to linkgit by Dan McGee · 17 years ago
  25. ca8e6b7 mergetool: add support for ECMerge by Steffen Prohaska · 17 years ago
  26. e3fa2c7 mergetool: use path to mergetool in config var mergetool.<tool>.path by Steffen Prohaska · 17 years ago
  27. 730b5b4 [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool by Dan McGee · 18 years ago
  28. a6080a0 War on whitespace by Junio C Hamano · 18 years ago
  29. e4e92b3 Document 'opendiff' value in config.txt and git-mergetool.txt by Arjen Laarhoven · 18 years ago
  30. e15b484 Fix minor formatting issue in man page for git-mergetool by Theodore Ts'o · 18 years ago
  31. 9cec653 mergetool: Add support for vimdiff. by James Bowes · 18 years ago
  32. c4b4a5a Add git-mergetool to run an appropriate merge conflict resolution program by Theodore Ts'o · 18 years ago