path: root/Documentation/merge-config.txt
AgeCommit message (Expand)Author
2010-07-02Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar
2009-04-08difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping
2009-04-08git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg
2009-04-08doc/merge-config: list ecmerge as a built-in merge toolMarkus Heidelberg
2008-12-10Improve language in git-merge.txt and related docsRalf Wildenhues
2008-11-26Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-docJunio C Hamano
2008-09-12Fix some manual typos.Ralf Wildenhues
2008-08-06Documentation: typos / spelling fixesMike Ralphson
2008-05-03add merge.renamelimit config optionJeff King
2008-04-13fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor
2008-04-13add 'merge.stat' config variableSZEDER Gábor
2008-04-13doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor