Google Git
Sign in
googlers / jrn / git / 21ccebec0dd1d7e624ea2f22af6ac93686daf34f / Documentation / merge-config.txt
  1. 39ca1bd Merge branch 'da/mergetool-docs' by Junio C Hamano · 12 years ago
  2. f35ec54 doc: generate a list of valid merge tools by David Aguilar · 12 years ago
  3. 2de9b71 Documentation: the name of the system is 'Git', not 'git' by Thomas Ackermann · 12 years ago
  4. a6d3bde Documentation: remote tracking branch -> remote-tracking branch by Matthieu Moy · 12 years ago
  5. f23e8de merge: introduce merge.ff configuration variable by Junio C Hamano · 14 years ago
  6. ffc5e3c Merge branch 'jc/merge-sans-branch' by Junio C Hamano · 14 years ago
  7. 93e535a merge: merge with the default upstream branch without argument by Junio C Hamano · 14 years ago
  8. ffe6dc0 mergetool--lib: Add Beyond Compare 3 as a tool by Sebastian Schuberth · 14 years ago
  9. aa03f60 mergetool--lib: Sort tools alphabetically for easier lookup by Sebastian Schuberth · 14 years ago
  10. 469bfc9 Fix typos in the documentation by Ralf Wildenhues · 14 years ago
  11. 02ef0ed Merge branch 'rr/fmt-merge-msg' by Junio C Hamano · 14 years ago
  12. bda3b8f merge: Make 'merge.log' an integer or boolean option by Ramkumar Ramachandra · 15 years ago
  13. f217f0e Avoid conflicts when merging branches with mixed normalization by Eyvind Bernhardsen · 15 years ago
  14. c8998b4 mergetool--lib: add p4merge as a pre-configured mergetool option by Scott Chacon · 15 years ago
  15. b6f0621 mergetool--lib: add support for araxis merge by David Aguilar · 16 years ago
  16. 1c0f3d2 difftool/mergetool: add diffuse as merge and diff tool by Sebastian Pipping · 16 years ago
  17. b98c212 git-mergetool: add new merge tool TortoiseMerge by Markus Heidelberg · 16 years ago
  18. da81688 doc/merge-config: list ecmerge as a built-in merge tool by Markus Heidelberg · 16 years ago
  19. 29b802a Improve language in git-merge.txt and related docs by Ralf Wildenhues · 16 years ago
  20. 42fc11c Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc by Junio C Hamano · 16 years ago
  21. b66e00f Fix some manual typos. by Ralf Wildenhues · 17 years ago
  22. 1168d40 Documentation: typos / spelling fixes by Mike Ralphson · 17 years ago
  23. 2a2ac92 add merge.renamelimit config option by Jeff King · 17 years ago
  24. 6cd9cfe fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable by SZEDER Gábor · 17 years ago
  25. 3e6c0a3 add 'merge.stat' config variable by SZEDER Gábor · 17 years ago
  26. f5a84c3 doc: moved merge.* config variables into separate merge-config.txt by SZEDER Gábor · 17 years ago