Age | Commit message (Expand) | Author |
---|---|---|
2009-05-24 | mergetool--lib: add support for araxis merge | David Aguilar |
2009-04-08 | difftool/mergetool: add diffuse as merge and diff tool | Sebastian Pipping |
2009-04-08 | git-mergetool: add new merge tool TortoiseMerge | Markus Heidelberg |
2009-04-08 | doc/merge-config: list ecmerge as a built-in merge tool | Markus Heidelberg |
2008-12-10 | Improve language in git-merge.txt and related docs | Ralf Wildenhues |
2008-11-26 | Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc | Junio C Hamano |
2008-09-13 | Fix some manual typos. | Ralf Wildenhues |
2008-08-06 | Documentation: typos / spelling fixes | Mike Ralphson |
2008-05-04 | add merge.renamelimit config option | Jeff King |
2008-04-13 | fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable | SZEDER Gábor |
2008-04-13 | add 'merge.stat' config variable | SZEDER Gábor |
2008-04-13 | doc: moved merge.* config variables into separate merge-config.txt | SZEDER Gábor |