summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
AgeCommit message (Expand)Author
2011-03-11doc: drop author/documentation sections from most pagesJeff King
2010-10-08Use parentheses and `...' where appropriateŠtěpán Němec
2010-07-19Documentation: Explain git-mergetool's use of temporary filesDavid Aguilar
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar
2009-04-08difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping
2009-04-08git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg
2009-01-18Documentation: let asciidoc align related optionsMarkus Heidelberg
2009-01-01Merge branch 'cb/mergetool'Junio C Hamano
2008-12-10Improve language in git-merge.txt and related docsRalf Wildenhues
2008-11-15Add -y/--no-prompt option to mergetoolCharles Bailey
2008-08-06Documentation: typos / spelling fixesMike Ralphson
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder
2008-07-02Documentation formatting and cleanupJonathan Nieder
2008-07-02Documentation: be consistent about "git-" versus "git "Jonathan Nieder
2008-06-06documentation: move git(7) to git(1)Christian Couder
2008-03-08merge-tool documentation: describe custom command usageCharles Bailey
2008-03-08git-mergetool documentaiton: show toolnames in typewriter fontCharles Bailey
2008-01-07Documentation: rename gitlink macro to linkgitDan McGee
2007-10-18mergetool: add support for ECMergeSteffen Prohaska
2007-10-18mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska
2007-06-10[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee
2007-06-07War on whitespaceJunio C Hamano
2007-05-04Document 'opendiff' value in config.txt and git-mergetool.txtArjen Laarhoven
2007-03-29Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o
2007-03-19mergetool: Add support for vimdiff.James Bowes
2007-03-14Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o