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