summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
Commit message (Expand)AuthorAgeFilesLines
* 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