aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-mergetool--lib.txt
AgeCommit message (Expand)AuthorFilesLines
2023-10-09documentation: fix capitalizationElijah Newren1-5/+5
2021-02-09mergetool: break setup_tool out into separate initialization functionSeth House1-0/+4
2019-05-13mergetool: use get_merge_tool functionDenton Liu1-1/+3
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann1-2/+2
2011-07-22Merge branch 'mz/doc-synopsis-verse'Junio C Hamano1-0/+1
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk1-0/+1
2011-06-29Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdashJunio C Hamano1-1/+1
2011-06-29Documentation: quote double-dash for AsciiDocJonathan Nieder1-1/+1
2011-03-11doc: drop author/documentation sections from most pagesJeff King1-8/+0
2010-08-24Work around em-dash handling in newer AsciiDocJunio C Hamano1-4/+4
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar1-9/+7
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar1-0/+56