aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-mergetool.txt
AgeCommit message (Expand)AuthorFilesLines
2023-10-09documentation: add some commas where they are helpfulElijah Newren1-2/+2
2023-10-09documentation: use clearer prepositionsElijah Newren1-1/+1
2023-10-09documentation: wording improvementsElijah Newren1-1/+1
2023-04-05mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks1-4/+5
2022-09-07docs: add and use include template for config/* includesÆvar Arnfjörð Bjarmason1-0/+3
2022-04-03vimdiff: add tool documentationFernando Ramos1-0/+8
2021-03-13doc: describe mergetool configuration in git-mergetool(1)Jonathan Nieder1-0/+4
2019-05-13mergetool: fallback to tool when guitool unavailableDenton Liu1-1/+3
2018-10-25mergetool: accept -g/--[no-]gui as argumentsDenton Liu1-0/+11
2016-10-11mergetool: honor -O<orderfile>David Aguilar1-4/+6
2016-10-11mergetool: honor diff.orderFileDavid Aguilar1-0/+5
2014-04-24mergetool: document the default for --[no-]promptJunio C Hamano1-3/+5
2013-05-17documentation: trivial style cleanupsFelipe Contreras1-1/+1
2012-08-27Merge branch 'da/difftool-updates'Junio C Hamano1-0/+3
2012-08-10mergetool,difftool: Document --tool-help consistentlyDavid Aguilar1-0/+3
2012-07-23mergetool: support --tool-help option like difftool doesJunio C Hamano1-3/+3
2011-10-10Merge branch 'jm/mergetool-pathspec'Junio C Hamano1-3/+4
2011-09-26mergetool: Use args as pathspec to unmerged filesJonathon Mah1-3/+4
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk1-0/+1
2011-03-19Merge branch 'ss/mergetool--lib'Junio C Hamano1-2/+2
2011-03-11doc: drop author/documentation sections from most pagesJeff King1-8/+0
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth1-1/+1
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth1-2/+2
2010-10-08Use parentheses and `...' where appropriateŠtěpán Němec1-1/+1
2010-07-19Documentation: Explain git-mergetool's use of temporary filesDavid Aguilar1-0/+10
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast1-8/+8
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon1-1/+1
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar1-1/+1
2009-04-07difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping1-1/+1
2009-04-07git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg1-1/+2
2009-01-17Documentation: let asciidoc align related optionsMarkus Heidelberg1-2/+4
2009-01-01Merge branch 'cb/mergetool'Junio C Hamano1-1/+10
2008-12-09Improve language in git-merge.txt and related docsRalf Wildenhues1-2/+2
2008-11-14Add -y/--no-prompt option to mergetoolCharles Bailey1-1/+10
2008-08-05Documentation: typos / spelling fixesMike Ralphson1-1/+1
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder1-8/+8
2008-07-01Documentation formatting and cleanupJonathan Nieder1-1/+1
2008-07-01Documentation: be consistent about "git-" versus "git "Jonathan Nieder1-8/+8
2008-06-06documentation: move git(7) to git(1)Christian Couder1-1/+1
2008-03-08merge-tool documentation: describe custom command usageCharles Bailey1-0/+22
2008-03-08git-mergetool documentaiton: show toolnames in typewriter fontCharles Bailey1-8/+8
2008-01-06Documentation: rename gitlink macro to linkgitDan McGee1-2/+2
2007-10-18mergetool: add support for ECMergeSteffen Prohaska1-1/+1
2007-10-18mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska1-0/+6
2007-06-10[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee1-1/+1
2007-06-07War on whitespaceJunio C Hamano1-1/+0
2007-05-03Document 'opendiff' value in config.txt and git-mergetool.txtArjen Laarhoven1-1/+1
2007-03-29Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o1-5/+5
2007-03-18mergetool: Add support for vimdiff.James Bowes1-1/+1
2007-03-13Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o1-0/+46
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-06 17:46:47 +0000