summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
AgeCommit message (Expand)AuthorFilesLines
2011-07-22Merge branch 'mz/doc-synopsis-verse'Libravatar Junio C Hamano1-0/+1
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsLibravatar Martin von Zweigbergk1-0/+1
2011-06-29Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdashLibravatar Junio C Hamano1-1/+1
2011-06-29Documentation: quote double-dash for AsciiDocLibravatar Jonathan Nieder1-1/+1
2011-03-11doc: drop author/documentation sections from most pagesLibravatar Jeff King1-8/+0
2010-08-24Work around em-dash handling in newer AsciiDocLibravatar Junio C Hamano1-4/+4
2009-04-12mergetool--lib: simplify API usage by removing more global variablesLibravatar David Aguilar1-9/+7
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libLibravatar David Aguilar1-0/+56