summaryrefslogtreecommitdiffstats
path: root/Documentation/merge-config.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
* Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-101-6/+6
* Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-docJunio C Hamano2008-11-261-3/+11
* Fix some manual typos.Ralf Wildenhues2008-09-121-1/+1
* Documentation: typos / spelling fixesMike Ralphson2008-08-061-2/+2
* add merge.renamelimit config optionJeff King2008-05-031-0/+5
* fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor2008-04-131-1/+1
* add 'merge.stat' config variableSZEDER Gábor2008-04-131-0/+4
* doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor2008-04-131-0/+31