summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
Commit message (Expand)AuthorAgeFilesLines
* mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks2023-04-051-4/+5
* docs: add and use include template for config/* includesÆvar Arnfjörð Bjarmason2022-09-071-0/+3
* vimdiff: add tool documentationFernando Ramos2022-04-031-0/+8
* doc: describe mergetool configuration in git-mergetool(1)Jonathan Nieder2021-03-131-0/+4
* mergetool: fallback to tool when guitool unavailableDenton Liu2019-05-131-1/+3
* mergetool: accept -g/--[no-]gui as argumentsDenton Liu2018-10-251-0/+11
* mergetool: honor -O<orderfile>da/mergetool-diff-orderDavid Aguilar2016-10-111-4/+6
* mergetool: honor diff.orderFileDavid Aguilar2016-10-111-0/+5
* mergetool: document the default for --[no-]promptfc/mergetool-promptJunio C Hamano2014-04-241-3/+5
* documentation: trivial style cleanupsFelipe Contreras2013-05-171-1/+1
* Merge branch 'da/difftool-updates'Junio C Hamano2012-08-271-0/+3
|\
| * mergetool,difftool: Document --tool-help consistentlyDavid Aguilar2012-08-101-0/+3
* | mergetool: support --tool-help option like difftool doesJunio C Hamano2012-07-231-3/+3
|/
* Merge branch 'jm/mergetool-pathspec'Junio C Hamano2011-10-101-3/+4
|\
| * mergetool: Use args as pathspec to unmerged filesJonathon Mah2011-09-261-3/+4
* | Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-061-0/+1
|/
* Merge branch 'ss/mergetool--lib'Junio C Hamano2011-03-191-2/+2
|\
| * mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-281-1/+1
| * mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth2011-02-281-2/+2
* | doc: drop author/documentation sections from most pagesJeff King2011-03-111-8/+0
|/
* Use parentheses and `...' where appropriateŠtěpán Němec2010-10-081-1/+1
* Documentation: Explain git-mergetool's use of temporary filesDavid Aguilar2010-07-191-0/+10
* Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-8/+8
* mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon2009-10-281-1/+1
* mergetool--lib: add support for araxis mergeDavid Aguilar2009-05-241-1/+1
* difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping2009-04-071-1/+1
* git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg2009-04-071-1/+2
* Documentation: let asciidoc align related optionsMarkus Heidelberg2009-01-171-2/+4
* Merge branch 'cb/mergetool'Junio C Hamano2009-01-011-1/+10
|\
| * Add -y/--no-prompt option to mergetoolCharles Bailey2008-11-141-1/+10
* | Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-091-2/+2
|/
* Documentation: typos / spelling fixesMike Ralphson2008-08-051-1/+1
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-051-8/+8
* Documentation formatting and cleanupJonathan Nieder2008-07-011-1/+1
* Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-011-8/+8
* documentation: move git(7) to git(1)Christian Couder2008-06-061-1/+1
* merge-tool documentation: describe custom command usageCharles Bailey2008-03-081-0/+22
* git-mergetool documentaiton: show toolnames in typewriter fontCharles Bailey2008-03-081-8/+8
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-061-2/+2
* mergetool: add support for ECMergeSteffen Prohaska2007-10-181-1/+1
* mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska2007-10-181-0/+6
* [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee2007-06-101-1/+1
* War on whitespaceJunio C Hamano2007-06-071-1/+0
* Document 'opendiff' value in config.txt and git-mergetool.txtArjen Laarhoven2007-05-031-1/+1
* Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o2007-03-291-5/+5
* mergetool: Add support for vimdiff.James Bowes2007-03-181-1/+1
* Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o2007-03-131-0/+46
View Lorry Controller Status