| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Documentation: let asciidoc align related options | Markus Heidelberg | 2009-01-17 | 1 | -2/+4 |
| * | Merge branch 'cb/mergetool' | Junio C Hamano | 2009-01-01 | 1 | -1/+10 |
| |\ |
|
| | * | Add -y/--no-prompt option to mergetool | Charles Bailey | 2008-11-14 | 1 | -1/+10 |
| * | | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 2008-12-09 | 1 | -2/+2 |
| |/ |
|
| * | Documentation: typos / spelling fixes | Mike Ralphson | 2008-08-05 | 1 | -1/+1 |
| * | manpages: italicize git command names (which were in teletype font) | Jonathan Nieder | 2008-07-05 | 1 | -8/+8 |
| * | Documentation formatting and cleanup | Jonathan Nieder | 2008-07-01 | 1 | -1/+1 |
| * | Documentation: be consistent about "git-" versus "git " | Jonathan Nieder | 2008-07-01 | 1 | -8/+8 |
| * | documentation: move git(7) to git(1) | Christian Couder | 2008-06-06 | 1 | -1/+1 |
| * | merge-tool documentation: describe custom command usage | Charles Bailey | 2008-03-08 | 1 | -0/+22 |
| * | git-mergetool documentaiton: show toolnames in typewriter font | Charles Bailey | 2008-03-08 | 1 | -8/+8 |
| * | Documentation: rename gitlink macro to linkgit | Dan McGee | 2008-01-06 | 1 | -2/+2 |
| * | mergetool: add support for ECMerge | Steffen Prohaska | 2007-10-18 | 1 | -1/+1 |
| * | mergetool: use path to mergetool in config var mergetool.<tool>.path | Steffen Prohaska | 2007-10-18 | 1 | -0/+6 |
| * | [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool | Dan McGee | 2007-06-10 | 1 | -1/+1 |
| * | War on whitespace | Junio C Hamano | 2007-06-07 | 1 | -1/+0 |
| * | Document 'opendiff' value in config.txt and git-mergetool.txt | Arjen Laarhoven | 2007-05-03 | 1 | -1/+1 |
| * | Fix minor formatting issue in man page for git-mergetool | Theodore Ts'o | 2007-03-29 | 1 | -5/+5 |
| * | mergetool: Add support for vimdiff. | James Bowes | 2007-03-18 | 1 | -1/+1 |
| * | Add git-mergetool to run an appropriate merge conflict resolution program | Theodore Ts'o | 2007-03-13 | 1 | -0/+46 |
