summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
AgeCommit message (Expand)Author
2022-09-07docs: add and use include template for config/* includesÆvar Arnfjörð Bjarmason
2022-04-03vimdiff: add tool documentationFernando Ramos
2021-03-13doc: describe mergetool configuration in git-mergetool(1)Jonathan Nieder
2019-05-13mergetool: fallback to tool when guitool unavailableDenton Liu
2018-10-25mergetool: accept -g/--[no-]gui as argumentsDenton Liu
2016-10-11mergetool: honor -O<orderfile>David Aguilar
2016-10-11mergetool: honor diff.orderFileDavid Aguilar
2014-04-24mergetool: document the default for --[no-]promptJunio C Hamano
2013-05-17documentation: trivial style cleanupsFelipe Contreras
2012-08-27Merge branch 'da/difftool-updates'Junio C Hamano
2012-08-10mergetool,difftool: Document --tool-help consistentlyDavid Aguilar
2012-07-23mergetool: support --tool-help option like difftool doesJunio C Hamano
2011-10-10Merge branch 'jm/mergetool-pathspec'Junio C Hamano
2011-09-26mergetool: Use args as pathspec to unmerged filesJonathon Mah
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk
2011-03-20Merge branch 'ss/mergetool--lib'Junio C Hamano
2011-03-11doc: drop author/documentation sections from most pagesJeff King
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth
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