summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
AgeCommit message (Expand)AuthorFilesLines
2014-04-24mergetool: document the default for --[no-]promptLibravatar Junio C Hamano1-3/+5
2013-05-17documentation: trivial style cleanupsLibravatar Felipe Contreras1-1/+1
2012-08-27Merge branch 'da/difftool-updates'Libravatar Junio C Hamano1-0/+3
2012-08-10mergetool,difftool: Document --tool-help consistentlyLibravatar David Aguilar1-0/+3
2012-07-23mergetool: support --tool-help option like difftool doesLibravatar Junio C Hamano1-3/+3
2011-10-10Merge branch 'jm/mergetool-pathspec'Libravatar Junio C Hamano1-3/+4
2011-09-26mergetool: Use args as pathspec to unmerged filesLibravatar Jonathon Mah1-3/+4
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsLibravatar Martin von Zweigbergk1-0/+1
2011-03-19Merge branch 'ss/mergetool--lib'Libravatar Junio C Hamano1-2/+2
2011-03-11doc: drop author/documentation sections from most pagesLibravatar Jeff King1-8/+0
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolLibravatar Sebastian Schuberth1-1/+1
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupLibravatar Sebastian Schuberth1-2/+2
2010-10-08Use parentheses and `...' where appropriateLibravatar Štěpán Němec1-1/+1
2010-07-19Documentation: Explain git-mergetool's use of temporary filesLibravatar David Aguilar1-0/+10
2010-01-10Documentation: spell 'git cmd' without dash throughoutLibravatar Thomas Rast1-8/+8
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionLibravatar Scott Chacon1-1/+1
2009-05-24mergetool--lib: add support for araxis mergeLibravatar David Aguilar1-1/+1
2009-04-07difftool/mergetool: add diffuse as merge and diff toolLibravatar Sebastian Pipping1-1/+1
2009-04-07git-mergetool: add new merge tool TortoiseMergeLibravatar Markus Heidelberg1-1/+2
2009-01-17Documentation: let asciidoc align related optionsLibravatar Markus Heidelberg1-2/+4
2009-01-01Merge branch 'cb/mergetool'Libravatar Junio C Hamano1-1/+10
2008-12-09Improve language in git-merge.txt and related docsLibravatar Ralf Wildenhues1-2/+2
2008-11-14Add -y/--no-prompt option to mergetoolLibravatar Charles Bailey1-1/+10
2008-08-05Documentation: typos / spelling fixesLibravatar Mike Ralphson1-1/+1
2008-07-05manpages: italicize git command names (which were in teletype font)Libravatar Jonathan Nieder1-8/+8
2008-07-01Documentation formatting and cleanupLibravatar Jonathan Nieder1-1/+1
2008-07-01Documentation: be consistent about "git-" versus "git "Libravatar Jonathan Nieder1-8/+8
2008-06-06documentation: move git(7) to git(1)Libravatar Christian Couder1-1/+1
2008-03-08merge-tool documentation: describe custom command usageLibravatar Charles Bailey1-0/+22
2008-03-08git-mergetool documentaiton: show toolnames in typewriter fontLibravatar Charles Bailey1-8/+8
2008-01-06Documentation: rename gitlink macro to linkgitLibravatar Dan McGee1-2/+2
2007-10-18mergetool: add support for ECMergeLibravatar Steffen Prohaska1-1/+1
2007-10-18mergetool: use path to mergetool in config var mergetool.<tool>.pathLibravatar Steffen Prohaska1-0/+6
2007-06-10[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolLibravatar Dan McGee1-1/+1
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+0
2007-05-03Document 'opendiff' value in config.txt and git-mergetool.txtLibravatar Arjen Laarhoven1-1/+1
2007-03-29Fix minor formatting issue in man page for git-mergetoolLibravatar Theodore Ts'o1-5/+5
2007-03-18mergetool: Add support for vimdiff.Libravatar James Bowes1-1/+1
2007-03-13Add git-mergetool to run an appropriate merge conflict resolution programLibravatar Theodore Ts'o1-0/+46
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 02:58:21 +0000