| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |