aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
Commit message (Expand)AuthorAge
* Documentation: let asciidoc align related optionsMarkus Heidelberg2009-01-17
* Merge branch 'cb/mergetool'Junio C Hamano2009-01-01
|\
| * Add -y/--no-prompt option to mergetoolCharles Bailey2008-11-14
* | Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-09
|/
* Documentation: typos / spelling fixesMike Ralphson2008-08-05
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-05
* Documentation formatting and cleanupJonathan Nieder2008-07-01
* Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-01
* documentation: move git(7) to git(1)Christian Couder2008-06-06
* merge-tool documentation: describe custom command usageCharles Bailey2008-03-08
* git-mergetool documentaiton: show toolnames in typewriter fontCharles Bailey2008-03-08
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-06
* mergetool: add support for ECMergeSteffen Prohaska2007-10-18
* mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska2007-10-18
* [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee2007-06-10
* War on whitespaceJunio C Hamano2007-06-07
* Document 'opendiff' value in config.txt and git-mergetool.txtArjen Laarhoven2007-05-03
* Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o2007-03-29
* mergetool: Add support for vimdiff.James Bowes2007-03-18
* Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o2007-03-13
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-19 19:42:15 +0000