summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
AgeCommit message (Expand)Author
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