| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2010-08-20 | mergetool: Remove explicit references to /dev/tty |  Charles Bailey | 1 | -1/+1 |
| 2010-01-29 | add shebang line to git-mergetool--lib.sh |  Jeff King | 1 | -0/+1 |
| 2009-11-25 | Merge branch 'rs/work-around-grep-opt-insanity' |  Junio C Hamano | 1 | -7/+6 |
| 2009-11-23 | mergetool--lib: simplify guess_merge_tool() |  René Scharfe | 1 | -7/+6 |
| 2009-10-28 | mergetool--lib: add p4merge as a pre-configured mergetool option |  Scott Chacon | 1 | -2/+15 |
| 2009-05-24 | mergetool--lib: add support for araxis merge |  David Aguilar | 1 | -2/+23 |
| 2009-05-09 | mergetool--lib: specialize diff options for emerge and ecmerge | David Aguilar | 1 | -3/+3 |
| 2009-04-12 | mergetool--lib: simplify API usage by removing more global variables | David Aguilar | 1 | -51/+58 |
| 2009-04-08 | difftool/mergetool: refactor commands to use git-mergetool--lib | David Aguilar | 1 | -0/+378 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |
path: root/git-mergetool--lib.sh