aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
Commit message (Expand)AuthorAge
* Merge branch 'mz/doc-synopsis-verse'Junio C Hamano2011-07-22
|\
| * Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-06
* | Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdashJunio C Hamano2011-06-29
|\ \ | |/ |/|
| * Documentation: quote double-dash for AsciiDocJonathan Nieder2011-06-29
* | doc: drop author/documentation sections from most pagesJeff King2011-03-11
|/
* Work around em-dash handling in newer AsciiDocJunio C Hamano2010-08-24
* mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-12
* difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-08