| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2009-04-07 | difftool/mergetool: add diffuse as merge and diff tool |  Sebastian Pipping | 1 | -1/+1 |
| 2009-04-07 | git-mergetool: add new merge tool TortoiseMerge |  Markus Heidelberg | 1 | -1/+1 |
| 2009-04-07 | doc/merge-config: list ecmerge as a built-in merge tool | Markus Heidelberg | 1 | -1/+2 |
| 2008-12-09 | Improve language in git-merge.txt and related docs |  Ralf Wildenhues | 1 | -6/+6 |
| 2008-11-26 | Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc |  Junio C Hamano | 1 | -3/+11 |
| 2008-09-12 | Fix some manual typos. | Ralf Wildenhues | 1 | -1/+1 |
| 2008-08-05 | Documentation: typos / spelling fixes |  Mike Ralphson | 1 | -2/+2 |
| 2008-05-03 | add merge.renamelimit config option |  Jeff King | 1 | -0/+5 |
| 2008-04-12 | fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable |  SZEDER Gábor | 1 | -1/+1 |
| 2008-04-12 | add 'merge.stat' config variable | SZEDER Gábor | 1 | -0/+4 |
| 2008-04-12 | doc: moved merge.* config variables into separate merge-config.txt | SZEDER Gábor | 1 | -0/+31 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |