| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | mergetool: add support for ECMerge | Steffen Prohaska | 2007-10-18 |
| * | mergetool: use path to mergetool in config var mergetool.<tool>.path | Steffen Prohaska | 2007-10-18 |
| * | [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool | Dan McGee | 2007-06-10 |
| * | War on whitespace | Junio C Hamano | 2007-06-07 |
| * | Document 'opendiff' value in config.txt and git-mergetool.txt | Arjen Laarhoven | 2007-05-03 |
| * | Fix minor formatting issue in man page for git-mergetool | Theodore Ts'o | 2007-03-29 |
| * | mergetool: Add support for vimdiff. | James Bowes | 2007-03-18 |
| * | Add git-mergetool to run an appropriate merge conflict resolution program | Theodore Ts'o | 2007-03-13 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |