Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |