Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 2008-12-09 |
* | Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc | Junio C Hamano | 2008-11-26 |
* | Fix some manual typos. | Ralf Wildenhues | 2008-09-12 |
* | Documentation: typos / spelling fixes | Mike Ralphson | 2008-08-05 |
* | add merge.renamelimit config option | Jeff King | 2008-05-03 |
* | fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable | SZEDER Gábor | 2008-04-12 |
* | add 'merge.stat' config variable | SZEDER Gábor | 2008-04-12 |
* | doc: moved merge.* config variables into separate merge-config.txt | SZEDER Gábor | 2008-04-12 |