summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
AgeCommit message (Expand)Author
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann
2011-07-22Merge branch 'mz/doc-synopsis-verse'Junio C Hamano
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk
2011-06-29Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdashJunio C Hamano
2011-06-29Documentation: quote double-dash for AsciiDocJonathan Nieder
2011-03-11doc: drop author/documentation sections from most pagesJeff King
2010-08-24Work around em-dash handling in newer AsciiDocJunio C Hamano
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar