| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | mergetool--lib: add support for araxis merge | David Aguilar | 2009-05-24 |
| * | difftool/mergetool: add diffuse as merge and diff tool | Sebastian Pipping | 2009-04-07 |
| * | git-mergetool: add new merge tool TortoiseMerge | Markus Heidelberg | 2009-04-07 |
| * | doc/merge-config: list ecmerge as a built-in merge tool | Markus Heidelberg | 2009-04-07 |
| * | 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 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |