aboutsummaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
Commit message (Expand)AuthorAge
* Documentation: typos / spelling fixesMike Ralphson2008-08-05
* add merge.renamelimit config optionJeff King2008-05-03
* fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor2008-04-12
* add 'merge.stat' config variableSZEDER Gábor2008-04-12
* doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor2008-04-12